about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--html/subx/001help.cc.html427
-rw-r--r--html/subx/002test.cc.html2
-rw-r--r--html/subx/003trace.cc.html644
-rw-r--r--html/subx/003trace.test.cc.html88
-rw-r--r--html/subx/010---vm.cc.html46
-rw-r--r--html/subx/011run.cc.html76
-rw-r--r--html/subx/012elf.cc.html46
-rw-r--r--html/subx/013direct_addressing.cc.html176
-rw-r--r--html/subx/014indirect_addressing.cc.html58
-rw-r--r--html/subx/015immediate_addressing.cc.html90
-rw-r--r--html/subx/016index_addressing.cc.html8
-rw-r--r--html/subx/017jump_disp8.cc.html28
-rw-r--r--html/subx/018jump_disp32.cc.html28
-rw-r--r--html/subx/019functions.cc.html16
-rw-r--r--html/subx/020syscalls.cc.html70
-rw-r--r--html/subx/021byte_addressing.cc.html18
-rw-r--r--html/subx/028translate.cc.html28
-rw-r--r--html/subx/030---operands.cc.html64
-rw-r--r--html/subx/031check_operands.cc.html240
-rw-r--r--html/subx/032check_operand_bounds.cc.html34
-rw-r--r--html/subx/034compute_segment_address.cc.html24
-rw-r--r--html/subx/035labels.cc.html56
-rw-r--r--html/subx/036global_variables.cc.html52
-rw-r--r--html/subx/038---literal_strings.cc.html36
-rw-r--r--html/subx/039debug.cc.html8
-rw-r--r--html/subx/040---tests.cc.html10
-rw-r--r--html/subx/052kernel_string_equal.subx.html2
-rw-r--r--html/subx/054string_equal.subx.html2
-rw-r--r--html/subx/055trace.subx.html2
-rw-r--r--html/subx/056write.subx.html2
-rw-r--r--html/subx/057stop.subx.html2
-rw-r--r--html/subx/058read.subx.html2
-rw-r--r--html/subx/059read-byte.subx.html2
-rw-r--r--html/subx/060write-stream.subx.html2
-rw-r--r--html/subx/062write-byte.subx.html2
-rw-r--r--html/subx/063print-byte.subx.html2
-rw-r--r--html/subx/064write-buffered.subx.html2
-rw-r--r--html/subx/apps/crenshaw2-1.subx.html2
-rw-r--r--html/subx/apps/crenshaw2-1b.subx.html2
-rw-r--r--html/subx/apps/factorial.subx.html2
-rw-r--r--html/subx/apps/hex.subx.html2
-rw-r--r--html/subx/examples/ex11.subx.html2
42 files changed, 1195 insertions, 1210 deletions
diff --git a/html/subx/001help.cc.html b/html/subx/001help.cc.html
index aa899790..563d890f 100644
--- a/html/subx/001help.cc.html
+++ b/html/subx/001help.cc.html
@@ -66,7 +66,7 @@ if ('onhashchange' in window) {
 <span id="L2" class="LineNr">  2 </span><span class="Comment">//: This should give you a sense for what to look forward to in later layers.</span>
 <span id="L3" class="LineNr">  3 </span>
 <span id="L4" class="LineNr">  4 </span><span class="Delimiter">:(before &quot;End Commandline Parsing&quot;)</span>
-<span id="L5" class="LineNr">  5 </span><span class="Normal">if</span> <span class="Delimiter">(</span>argc &lt;= <span class="Constant">1</span> || <a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;--help&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L5" class="LineNr">  5 </span><span class="Normal">if</span> <span class="Delimiter">(</span>argc &lt;= <span class="Constant">1</span> || <a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;--help&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L6" class="LineNr">  6 </span>  <span class="Comment">//: this is the functionality later layers will provide</span>
 <span id="L7" class="LineNr">  7 </span>  <span class="Comment">// currently no automated tests for commandline arg parsing</span>
 <span id="L8" class="LineNr">  8 </span>  cerr &lt;&lt; get<span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;usage&quot;</span><span class="Delimiter">);</span>
@@ -77,7 +77,7 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr"> 13 </span><span class="Comment">//: Options always begin with '--' and are always the first arguments. An</span>
 <span id="L14" class="LineNr"> 14 </span><span class="Comment">//: option will never follow a non-option.</span>
 <span id="L15" class="LineNr"> 15 </span><span class="Normal">char</span>** <a href='001help.cc.html#L15'>arg</a> = &amp;argv[<span class="Constant">1</span>]<span class="Delimiter">;</span>
-<span id="L16" class="LineNr"> 16 </span><span class="Normal">while</span> <span class="Delimiter">(</span>argc &gt; <span class="Constant">1</span> &amp;&amp; <a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L16" class="LineNr"> 16 </span><span class="Normal">while</span> <span class="Delimiter">(</span>argc &gt; <span class="Constant">1</span> &amp;&amp; <a href='001help.cc.html#L102'>starts_with</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L17" class="LineNr"> 17 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">)</span>
 <span id="L18" class="LineNr"> 18 </span>    <span class="Delimiter">;</span>  <span class="Comment">// no-op branch just so any further additions can consistently always start with 'else'</span>
 <span id="L19" class="LineNr"> 19 </span>  <span class="Comment">// End Commandline Options(*arg)</span>
@@ -86,7 +86,7 @@ if ('onhashchange' in window) {
 <span id="L22" class="LineNr"> 22 </span>  --argc<span class="Delimiter">;</span>  ++argv<span class="Delimiter">;</span>  ++arg<span class="Delimiter">;</span>
 <span id="L23" class="LineNr"> 23 </span><span class="Delimiter">}</span>
 <span id="L24" class="LineNr"> 24 </span>
-<span id="L25" class="LineNr"> 25 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;help&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L25" class="LineNr"> 25 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;help&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L26" class="LineNr"> 26 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>argc == <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L27" class="LineNr"> 27 </span>    cerr &lt;&lt; <span class="Constant">&quot;help on what?\n&quot;</span><span class="Delimiter">;</span>
 <span id="L28" class="LineNr"> 28 </span>    <a href='001help.cc.html#L46'>help_contents</a><span class="Delimiter">();</span>
@@ -94,7 +94,7 @@ if ('onhashchange' in window) {
 <span id="L30" class="LineNr"> 30 </span>  <span class="Delimiter">}</span>
 <span id="L31" class="LineNr"> 31 </span>  string key<span class="Delimiter">(</span>argv[<span class="Constant">2</span>]<span class="Delimiter">);</span>
 <span id="L32" class="LineNr"> 32 </span>  <span class="Comment">// End Help Special-cases(key)</span>
-<span id="L33" class="LineNr"> 33 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L247'>contains_key</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> key<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L33" class="LineNr"> 33 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> key<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L34" class="LineNr"> 34 </span>    cerr &lt;&lt; get<span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> key<span class="Delimiter">);</span>
 <span id="L35" class="LineNr"> 35 </span>    <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L36" class="LineNr"> 36 </span>  <span class="Delimiter">}</span>
@@ -122,7 +122,7 @@ if ('onhashchange' in window) {
 <span id="L58" class="LineNr"> 58 </span><a href='001help.cc.html#L60'>init_help</a><span class="Delimiter">();</span>
 <span id="L59" class="LineNr"> 59 </span><span class="Delimiter">:(code)</span>
 <span id="L60" class="LineNr"> 60 </span><span class="Normal">void</span> <a href='001help.cc.html#L60'>init_help</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L61" class="LineNr"> 61 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;usage&quot;</span><span class="Delimiter">,</span>
+<span id="L61" class="LineNr"> 61 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;usage&quot;</span><span class="Delimiter">,</span>
 <span id="L62" class="LineNr"> 62 </span>    <span class="Constant">&quot;Welcome to SubX, a better way to <a href='011run.cc.html#L99'>program</a> in machine code.\n&quot;</span>
 <span id="L63" class="LineNr"> 63 </span>    <span class="Constant">&quot;SubX uses a subset of the x86 instruction set. SubX programs will run\n&quot;</span>
 <span id="L64" class="LineNr"> 64 </span>    <span class="Constant">&quot;without modification on Linux computers.\n&quot;</span>
@@ -140,215 +140,224 @@ if ('onhashchange' in window) {
 <span id="L76" class="LineNr"> 76 </span>    <span class="Constant">&quot;    subx translate input1.subx intput2.subx ... -o &lt;output ELF binary&gt;\n&quot;</span>
 <span id="L77" class="LineNr"> 77 </span>    <span class="Constant">&quot;- Run a SubX binary using SubX itself (for better error messages):\n&quot;</span>
 <span id="L78" class="LineNr"> 78 </span>    <span class="Constant">&quot;    subx <a href='011run.cc.html#L83'>run</a> &lt;ELF binary&gt;\n&quot;</span>
-<span id="L79" class="LineNr"> 79 </span>    <span class="Constant">&quot;Add '--trace' to any of these commands to also emit a <a href='003trace.cc.html#L203'>trace</a>, for debugging purposes.\n&quot;</span>
-<span id="L80" class="LineNr"> 80 </span>    <span class="Constant">&quot;However, options starting with '--' must always come before any other arguments.\n&quot;</span>
-<span id="L81" class="LineNr"> 81 </span>    <span class="Constant">&quot;\n&quot;</span>
-<span id="L82" class="LineNr"> 82 </span>    <span class="Constant">&quot;To start learning how to write SubX programs, <a href='011run.cc.html#L83'>run</a>:\n&quot;</span>
-<span id="L83" class="LineNr"> 83 </span>    <span class="Constant">&quot;  subx help\n&quot;</span>
-<span id="L84" class="LineNr"> 84 </span>  <span class="Delimiter">);</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Comment">// End Help Texts</span>
-<span id="L86" class="LineNr"> 86 </span><span class="Delimiter">}</span>
-<span id="L87" class="LineNr"> 87 </span>
-<span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(code)</span>
-<span id="L89" class="LineNr"> 89 </span><span class="Normal">bool</span> <a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span><span class="Normal">char</span>* s<span class="Delimiter">,</span> <span class="Normal">const</span> <span class="Normal">char</span>* lit<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L90" class="LineNr"> 90 </span>  <span class="Identifier">return</span> strncmp<span class="Delimiter">(</span>s<span class="Delimiter">,</span> lit<span class="Delimiter">,</span> strlen<span class="Delimiter">(</span>lit<span class="Delimiter">))</span> == <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L91" class="LineNr"> 91 </span><span class="Delimiter">}</span>
-<span id="L92" class="LineNr"> 92 </span>
-<span id="L93" class="LineNr"> 93 </span><span class="Normal">bool</span> <a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; pat<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L94" class="LineNr"> 94 </span>  string::const_iterator a=s<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> b=pat<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
-<span id="L95" class="LineNr"> 95 </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>  a!=s<span class="Delimiter">.</span>end<span class="Delimiter">()</span> &amp;&amp; b!=pat<span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++a<span class="Delimiter">,</span> ++b<span class="Delimiter">)</span>
-<span id="L96" class="LineNr"> 96 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>*a != *b<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L97" class="LineNr"> 97 </span>  <span class="Identifier">return</span> b == pat<span class="Delimiter">.</span>end<span class="Delimiter">();</span>
-<span id="L98" class="LineNr"> 98 </span><span class="Delimiter">}</span>
-<span id="L99" class="LineNr"> 99 </span>
-<span id="L100" class="LineNr">100 </span><span class="Comment">//: I'll throw some style conventions here for want of a better place for them.</span>
-<span id="L101" class="LineNr">101 </span><span class="Comment">//: As a rule I hate style guides. Do what you want, that's my motto. But since</span>
-<span id="L102" class="LineNr">102 </span><span class="Comment">//: we're dealing with C/C++, the one big thing we want to avoid is undefined</span>
-<span id="L103" class="LineNr">103 </span><span class="Comment">//: behavior. If a compiler ever encounters undefined behavior it can make</span>
-<span id="L104" class="LineNr">104 </span><span class="Comment">//: your program do anything it wants.</span>
-<span id="L105" class="LineNr">105 </span><span class="Comment">//:</span>
-<span id="L106" class="LineNr">106 </span><span class="Comment">//: For reference, my checklist of undefined behaviors to watch out for:</span>
-<span id="L107" class="LineNr">107 </span><span class="Comment">//:   out-of-bounds access</span>
-<span id="L108" class="LineNr">108 </span><span class="Comment">//:   uninitialized variables</span>
-<span id="L109" class="LineNr">109 </span><span class="Comment">//:   use after free</span>
-<span id="L110" class="LineNr">110 </span><span class="Comment">//:   dereferencing invalid pointers: null, a new of size 0, others</span>
-<span id="L111" class="LineNr">111 </span><span class="Comment">//:</span>
-<span id="L112" class="LineNr">112 </span><span class="Comment">//:   casting a large number to a type too small to hold it</span>
-<span id="L113" class="LineNr">113 </span><span class="Comment">//:</span>
-<span id="L114" class="LineNr">114 </span><span class="Comment">//:   integer overflow</span>
-<span id="L115" class="LineNr">115 </span><span class="Comment">//:   division by zero and other undefined expressions</span>
-<span id="L116" class="LineNr">116 </span><span class="Comment">//:   left-shift by negative count</span>
-<span id="L117" class="LineNr">117 </span><span class="Comment">//:   shifting values by more than or equal to the number of bits they contain</span>
-<span id="L118" class="LineNr">118 </span><span class="Comment">//:   bitwise operations on signed numbers</span>
-<span id="L119" class="LineNr">119 </span><span class="Comment">//:</span>
-<span id="L120" class="LineNr">120 </span><span class="Comment">//:   Converting pointers to types of different alignment requirements</span>
-<span id="L121" class="LineNr">121 </span><span class="Comment">//:     T* -&gt; void* -&gt; T*: defined</span>
-<span id="L122" class="LineNr">122 </span><span class="Comment">//:     T* -&gt; U* -&gt; T*: defined if non-function pointers and alignment requirements are same</span>
-<span id="L123" class="LineNr">123 </span><span class="Comment">//:     function pointers may be cast to other function pointers</span>
-<span id="L124" class="LineNr">124 </span><span class="Comment">//:</span>
-<span id="L125" class="LineNr">125 </span><span class="Comment">//:       Casting a numeric value into a value that can't be represented by the target type (either directly or via static_cast)</span>
-<span id="L126" class="LineNr">126 </span><span class="Comment">//:</span>
-<span id="L127" class="LineNr">127 </span><span class="Comment">//: To guard against these, some conventions:</span>
+<span id="L79" class="LineNr"> 79 </span>    <span class="Constant">&quot;\n&quot;</span>
+<span id="L80" class="LineNr"> 80 </span>    <span class="Constant">&quot;== Debugging aids\n&quot;</span>
+<span id="L81" class="LineNr"> 81 </span>    <span class="Constant">&quot;- Add '--trace' to any of these commands to print a <a href='003trace.cc.html#L183'>trace</a> to stderr\n&quot;</span>
+<span id="L82" class="LineNr"> 82 </span>    <span class="Constant">&quot;  for debugging purposes.\n&quot;</span>
+<span id="L83" class="LineNr"> 83 </span>    <span class="Constant">&quot;- Add '--map' to add information to traces. 'subx --map translate' will save\n&quot;</span>
+<span id="L84" class="LineNr"> 84 </span>    <span class="Constant">&quot;  (to a file called 'map') the mapping from labels to addresses that it computes\n&quot;</span>
+<span id="L85" class="LineNr"> 85 </span>    <span class="Constant">&quot;  during translation. This file is then available to 'subx --map --trace run'\n&quot;</span>
+<span id="L86" class="LineNr"> 86 </span>    <span class="Constant">&quot;  which prints out label names in the <a href='003trace.cc.html#L183'>trace</a> as it encounters them.\n&quot;</span>
+<span id="L87" class="LineNr"> 87 </span>    <span class="Constant">&quot;\n&quot;</span>
+<span id="L88" class="LineNr"> 88 </span>    <span class="Constant">&quot;Options starting with '--' must always come before any other arguments.\n&quot;</span>
+<span id="L89" class="LineNr"> 89 </span>    <span class="Constant">&quot;\n&quot;</span>
+<span id="L90" class="LineNr"> 90 </span>    <span class="Constant">&quot;To start learning how to write SubX programs, see Readme.md (particularly\n&quot;</span>
+<span id="L91" class="LineNr"> 91 </span>    <span class="Constant">&quot;the section on the x86 instruction set) and then <a href='011run.cc.html#L83'>run</a>:\n&quot;</span>
+<span id="L92" class="LineNr"> 92 </span>    <span class="Constant">&quot;  subx help\n&quot;</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Delimiter">);</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Comment">// End Help Texts</span>
+<span id="L95" class="LineNr"> 95 </span><span class="Delimiter">}</span>
+<span id="L96" class="LineNr"> 96 </span>
+<span id="L97" class="LineNr"> 97 </span><span class="Delimiter">:(code)</span>
+<span id="L98" class="LineNr"> 98 </span><span class="Normal">bool</span> <a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span><span class="Normal">char</span>* s<span class="Delimiter">,</span> <span class="Normal">const</span> <span class="Normal">char</span>* lit<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="Identifier">return</span> strncmp<span class="Delimiter">(</span>s<span class="Delimiter">,</span> lit<span class="Delimiter">,</span> strlen<span class="Delimiter">(</span>lit<span class="Delimiter">))</span> == <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L100" class="LineNr">100 </span><span class="Delimiter">}</span>
+<span id="L101" class="LineNr">101 </span>
+<span id="L102" class="LineNr">102 </span><span class="Normal">bool</span> <a href='001help.cc.html#L102'>starts_with</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; pat<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L103" class="LineNr">103 </span>  string::const_iterator a=s<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> b=pat<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
+<span id="L104" class="LineNr">104 </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>  a!=s<span class="Delimiter">.</span>end<span class="Delimiter">()</span> &amp;&amp; b!=pat<span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++a<span class="Delimiter">,</span> ++b<span class="Delimiter">)</span>
+<span id="L105" class="LineNr">105 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>*a != *b<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L106" class="LineNr">106 </span>  <span class="Identifier">return</span> b == pat<span class="Delimiter">.</span>end<span class="Delimiter">();</span>
+<span id="L107" class="LineNr">107 </span><span class="Delimiter">}</span>
+<span id="L108" class="LineNr">108 </span>
+<span id="L109" class="LineNr">109 </span><span class="Comment">//: I'll throw some style conventions here for want of a better place for them.</span>
+<span id="L110" class="LineNr">110 </span><span class="Comment">//: As a rule I hate style guides. Do what you want, that's my motto. But since</span>
+<span id="L111" class="LineNr">111 </span><span class="Comment">//: we're dealing with C/C++, the one big thing we want to avoid is undefined</span>
+<span id="L112" class="LineNr">112 </span><span class="Comment">//: behavior. If a compiler ever encounters undefined behavior it can make</span>
+<span id="L113" class="LineNr">113 </span><span class="Comment">//: your program do anything it wants.</span>
+<span id="L114" class="LineNr">114 </span><span class="Comment">//:</span>
+<span id="L115" class="LineNr">115 </span><span class="Comment">//: For reference, my checklist of undefined behaviors to watch out for:</span>
+<span id="L116" class="LineNr">116 </span><span class="Comment">//:   out-of-bounds access</span>
+<span id="L117" class="LineNr">117 </span><span class="Comment">//:   uninitialized variables</span>
+<span id="L118" class="LineNr">118 </span><span class="Comment">//:   use after free</span>
+<span id="L119" class="LineNr">119 </span><span class="Comment">//:   dereferencing invalid pointers: null, a new of size 0, others</span>
+<span id="L120" class="LineNr">120 </span><span class="Comment">//:</span>
+<span id="L121" class="LineNr">121 </span><span class="Comment">//:   casting a large number to a type too small to hold it</span>
+<span id="L122" class="LineNr">122 </span><span class="Comment">//:</span>
+<span id="L123" class="LineNr">123 </span><span class="Comment">//:   integer overflow</span>
+<span id="L124" class="LineNr">124 </span><span class="Comment">//:   division by zero and other undefined expressions</span>
+<span id="L125" class="LineNr">125 </span><span class="Comment">//:   left-shift by negative count</span>
+<span id="L126" class="LineNr">126 </span><span class="Comment">//:   shifting values by more than or equal to the number of bits they contain</span>
+<span id="L127" class="LineNr">127 </span><span class="Comment">//:   bitwise operations on signed numbers</span>
 <span id="L128" class="LineNr">128 </span><span class="Comment">//:</span>
-<span id="L129" class="LineNr">129 </span><span class="Comment">//: 0. Initialize all primitive variables in functions and constructors.</span>
-<span id="L130" class="LineNr">130 </span><span class="Comment">//:</span>
-<span id="L131" class="LineNr">131 </span><span class="Comment">//: 1. Minimize use of pointers and pointer arithmetic. Avoid 'new' and</span>
-<span id="L132" class="LineNr">132 </span><span class="Comment">//: 'delete' as far as possible. Rely on STL to perform memory management to</span>
-<span id="L133" class="LineNr">133 </span><span class="Comment">//: avoid use-after-free issues (and memory leaks).</span>
-<span id="L134" class="LineNr">134 </span><span class="Comment">//:</span>
-<span id="L135" class="LineNr">135 </span><span class="Comment">//: 2. Avoid naked arrays to avoid out-of-bounds access. Never use operator[]</span>
-<span id="L136" class="LineNr">136 </span><span class="Comment">//: except with map. Use at() with STL vectors and so on.</span>
+<span id="L129" class="LineNr">129 </span><span class="Comment">//:   Converting pointers to types of different alignment requirements</span>
+<span id="L130" class="LineNr">130 </span><span class="Comment">//:     T* -&gt; void* -&gt; T*: defined</span>
+<span id="L131" class="LineNr">131 </span><span class="Comment">//:     T* -&gt; U* -&gt; T*: defined if non-function pointers and alignment requirements are same</span>
+<span id="L132" class="LineNr">132 </span><span class="Comment">//:     function pointers may be cast to other function pointers</span>
+<span id="L133" class="LineNr">133 </span><span class="Comment">//:</span>
+<span id="L134" class="LineNr">134 </span><span class="Comment">//:       Casting a numeric value into a value that can't be represented by the target type (either directly or via static_cast)</span>
+<span id="L135" class="LineNr">135 </span><span class="Comment">//:</span>
+<span id="L136" class="LineNr">136 </span><span class="Comment">//: To guard against these, some conventions:</span>
 <span id="L137" class="LineNr">137 </span><span class="Comment">//:</span>
-<span id="L138" class="LineNr">138 </span><span class="Comment">//: 3. Valgrind all the things.</span>
+<span id="L138" class="LineNr">138 </span><span class="Comment">//: 0. Initialize all primitive variables in functions and constructors.</span>
 <span id="L139" class="LineNr">139 </span><span class="Comment">//:</span>
-<span id="L140" class="LineNr">140 </span><span class="Comment">//: 4. Avoid unsigned numbers. Not strictly an undefined-behavior issue, but</span>
-<span id="L141" class="LineNr">141 </span><span class="Comment">//: the extra range doesn't matter, and it's one less confusing category of</span>
-<span id="L142" class="LineNr">142 </span><span class="Comment">//: interaction gotchas to worry about.</span>
+<span id="L140" class="LineNr">140 </span><span class="Comment">//: 1. Minimize use of pointers and pointer arithmetic. Avoid 'new' and</span>
+<span id="L141" class="LineNr">141 </span><span class="Comment">//: 'delete' as far as possible. Rely on STL to perform memory management to</span>
+<span id="L142" class="LineNr">142 </span><span class="Comment">//: avoid use-after-free issues (and memory leaks).</span>
 <span id="L143" class="LineNr">143 </span><span class="Comment">//:</span>
-<span id="L144" class="LineNr">144 </span><span class="Comment">//: Corollary: don't use the size() method on containers, since it returns an</span>
-<span id="L145" class="LineNr">145 </span><span class="Comment">//: unsigned and that'll cause warnings about mixing signed and unsigned,</span>
-<span id="L146" class="LineNr">146 </span><span class="Comment">//: yadda-yadda. Instead use this macro below to perform an unsafe cast to</span>
-<span id="L147" class="LineNr">147 </span><span class="Comment">//: signed. We'll just give up immediately if a container's ever too large.</span>
-<span id="L148" class="LineNr">148 </span><span class="Comment">//: Basically, Mu is not concerned about this being a little slower than it</span>
-<span id="L149" class="LineNr">149 </span><span class="Comment">//: could be. (<a href="https://gist.github.com/rygorous/e0f055bfb74e3d5f0af20690759de5a7">https://gist.github.com/rygorous/e0f055bfb74e3d5f0af20690759de5a7</a>)</span>
-<span id="L150" class="LineNr">150 </span><span class="Comment">//:</span>
-<span id="L151" class="LineNr">151 </span><span class="Comment">//: Addendum to corollary: We're going to uniformly use int everywhere, to</span>
-<span id="L152" class="LineNr">152 </span><span class="Comment">//: indicate that we're oblivious to number size, and since Clang on 32-bit</span>
-<span id="L153" class="LineNr">153 </span><span class="Comment">//: platforms doesn't yet support multiplication over 64-bit integers, and</span>
-<span id="L154" class="LineNr">154 </span><span class="Comment">//: since multiplying two integers seems like a more common situation to end</span>
-<span id="L155" class="LineNr">155 </span><span class="Comment">//: up in than integer overflow.</span>
-<span id="L156" class="LineNr">156 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L157" class="LineNr">157 </span><span class="Comment">#define SIZE(X) (assert((X).size() &lt; (1LL&lt;&lt;(sizeof(int)*8-2))), static_cast&lt;int&gt;((X).size()))</span>
-<span id="L158" class="LineNr">158 </span>
-<span id="L159" class="LineNr">159 </span><span class="Comment">//: 5. Integer overflow is guarded against at runtime using the -ftrapv flag</span>
-<span id="L160" class="LineNr">160 </span><span class="Comment">//: to the compiler, supported by Clang (GCC version only works sometimes:</span>
-<span id="L161" class="LineNr">161 </span><span class="Comment">//: <a href="http://stackoverflow.com/questions/20851061/how-to-make-gcc-ftrapv-work">http://stackoverflow.com/questions/20851061/how-to-make-gcc-ftrapv-work</a>).</span>
-<span id="L162" class="LineNr">162 </span><span class="Delimiter">:(before &quot;atexit(reset)&quot;)</span>
-<span id="L163" class="LineNr">163 </span><a href='001help.cc.html#L168'>initialize_signal_handlers</a><span class="Delimiter">();</span>  <span class="Comment">// not always necessary, but doesn't hurt</span>
-<span id="L164" class="LineNr">164 </span><span class="CommentedCode">//? cerr &lt;&lt; INT_MAX+1 &lt;&lt; '\n';  // test overflow</span>
-<span id="L165" class="LineNr">165 </span><span class="CommentedCode">//? assert(false);  // test SIGABRT</span>
-<span id="L166" class="LineNr">166 </span><span class="Delimiter">:(code)</span>
-<span id="L167" class="LineNr">167 </span><span class="Comment">// based on <a href="https://spin.atomicobject.com/2013/01/13/exceptions-stack-traces-c">https://spin.atomicobject.com/2013/01/13/exceptions-stack-traces-c</a></span>
-<span id="L168" class="LineNr">168 </span><span class="Normal">void</span> <a href='001help.cc.html#L168'>initialize_signal_handlers</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L169" class="LineNr">169 </span>  <span class="Normal">struct</span> sigaction action<span class="Delimiter">;</span>
-<span id="L170" class="LineNr">170 </span>  bzero<span class="Delimiter">(</span>&amp;action<span class="Delimiter">,</span> <span class="Normal">sizeof</span><span class="Delimiter">(</span>action<span class="Delimiter">));</span>
-<span id="L171" class="LineNr">171 </span>  action<span class="Delimiter">.</span>sa_sigaction = <a href='001help.cc.html#L176'>dump_and_exit</a><span class="Delimiter">;</span>
-<span id="L172" class="LineNr">172 </span>  sigemptyset<span class="Delimiter">(</span>&amp;action<span class="Delimiter">.</span>sa_mask<span class="Delimiter">);</span>
-<span id="L173" class="LineNr">173 </span>  sigaction<span class="Delimiter">(</span><span class="Constant">SIGABRT</span><span class="Delimiter">,</span> &amp;action<span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">);</span>  <span class="Comment">// assert() failure or integer overflow on linux (with -ftrapv)</span>
-<span id="L174" class="LineNr">174 </span>  sigaction<span class="Delimiter">(</span><span class="Constant">SIGILL</span><span class="Delimiter">,</span>  &amp;action<span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">);</span>  <span class="Comment">// integer overflow on OS X (with -ftrapv)</span>
-<span id="L175" class="LineNr">175 </span><span class="Delimiter">}</span>
-<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="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\n&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="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="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\n&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="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>
-<span id="L192" class="LineNr">192 </span>  <span class="Delimiter">}</span>
-<span id="L193" class="LineNr">193 </span><span class="Delimiter">}</span>
-<span id="L194" class="LineNr">194 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L195" class="LineNr">195 </span><span class="Comment">#include &lt;signal.h&gt;</span>
-<span id="L196" class="LineNr">196 </span>
-<span id="L197" class="LineNr">197 </span><span class="Comment">//: For good measure we'll also enable SIGFPE.</span>
-<span id="L198" class="LineNr">198 </span><span class="Delimiter">:(before &quot;atexit(reset)&quot;)</span>
-<span id="L199" class="LineNr">199 </span><a href='001help.cc.html#L212'>feenableexcept</a><span class="Delimiter">(</span>FE_OVERFLOW | FE_UNDERFLOW<span class="Delimiter">);</span>
-<span id="L200" class="LineNr">200 </span><span class="CommentedCode">//? assert(sizeof(int) == 4 &amp;&amp; sizeof(float) == 4);</span>
-<span id="L201" class="LineNr">201 </span><span class="CommentedCode">//? //                          | exp   |  mantissa</span>
-<span id="L202" class="LineNr">202 </span><span class="CommentedCode">//? int smallest_subnormal = 0b00000000000000000000000000000001;</span>
-<span id="L203" class="LineNr">203 </span><span class="CommentedCode">//? float smallest_subnormal_f = *reinterpret_cast&lt;float*&gt;(&amp;smallest_subnormal);</span>
-<span id="L204" class="LineNr">204 </span><span class="CommentedCode">//? cerr &lt;&lt; &quot;ε: &quot; &lt;&lt; smallest_subnormal_f &lt;&lt; '\n';</span>
-<span id="L205" class="LineNr">205 </span><span class="CommentedCode">//? cerr &lt;&lt; &quot;ε/2: &quot; &lt;&lt; smallest_subnormal_f/2 &lt;&lt; &quot; (underflow)\n&quot;;  // test SIGFPE</span>
-<span id="L206" class="LineNr">206 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L207" class="LineNr">207 </span><span class="Comment">#include &lt;fenv.h&gt;</span>
-<span id="L208" class="LineNr">208 </span><span class="Delimiter">:(code)</span>
-<span id="L209" class="LineNr">209 </span><span class="Comment">#ifdef __APPLE__</span>
-<span id="L210" class="LineNr">210 </span><span class="Comment">// Public domain polyfill for feenableexcept on OS X</span>
-<span id="L211" class="LineNr">211 </span><span class="Comment">// <a href="http://www-personal.umich.edu/~williams/archive/computation/fe-handling-example.c">http://www-personal.umich.edu/~williams/archive/computation/fe-handling-example.c</a></span>
-<span id="L212" class="LineNr">212 </span><span class="Normal">int</span> <a href='001help.cc.html#L212'>feenableexcept</a><span class="Delimiter">(</span><span class="Normal">unsigned</span> <span class="Normal">int</span> excepts<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L213" class="LineNr">213 </span>  <span class="Normal">static</span> fenv_t fenv<span class="Delimiter">;</span>
-<span id="L214" class="LineNr">214 </span>  <span class="Normal">unsigned</span> <span class="Normal">int</span> new_excepts = excepts &amp; FE_ALL_EXCEPT<span class="Delimiter">;</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Normal">unsigned</span> <span class="Normal">int</span> old_excepts<span class="Delimiter">;</span>
-<span id="L216" class="LineNr">216 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>fegetenv<span class="Delimiter">(</span>&amp;fenv<span class="Delimiter">))</span> <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L217" class="LineNr">217 </span>  old_excepts = fenv<span class="Delimiter">.</span>__control &amp; FE_ALL_EXCEPT<span class="Delimiter">;</span>
-<span id="L218" class="LineNr">218 </span>  fenv<span class="Delimiter">.</span>__control &amp;= ~new_excepts<span class="Delimiter">;</span>
-<span id="L219" class="LineNr">219 </span>  fenv<span class="Delimiter">.</span>__mxcsr &amp;= ~<span class="Delimiter">(</span>new_excepts &lt;&lt; <span class="Constant">7</span><span class="Delimiter">);</span>
-<span id="L220" class="LineNr">220 </span>  <span class="Identifier">return</span> fesetenv<span class="Delimiter">(</span>&amp;fenv<span class="Delimiter">)</span> ? -<span class="Constant">1</span> : old_excepts<span class="Delimiter">;</span>
-<span id="L221" class="LineNr">221 </span><span class="Delimiter">}</span>
-<span id="L222" class="LineNr">222 </span><span class="Comment">#endif</span>
-<span id="L223" class="LineNr">223 </span>
-<span id="L224" class="LineNr">224 </span><span class="Comment">//: 6. Map's operator[] being non-const is fucking evil.</span>
-<span id="L225" class="LineNr">225 </span><span class="Delimiter">:(before &quot;Globals&quot;)</span>  <span class="Comment">// can't generate prototypes for these</span>
-<span id="L226" class="LineNr">226 </span><span class="Comment">// from <a href="http://stackoverflow.com/questions/152643/idiomatic-c-for-reading-from-a-const-map">http://stackoverflow.com/questions/152643/idiomatic-c-for-reading-from-a-const-map</a></span>
-<span id="L227" class="LineNr">227 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> <span class="Special">T</span>&gt; <span class="Normal">typename</span> <span class="Special">T</span>::mapped_type&amp; get<span class="Delimiter">(</span><span class="Special">T</span>&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> <span class="Special">T</span>::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L228" class="LineNr">228 </span>  <span class="Normal">typename</span> <span class="Special">T</span>::iterator iter<span class="Delimiter">(</span>map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">));</span>
-<span id="L229" class="LineNr">229 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>iter == map<span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L230" class="LineNr">230 </span>    cerr &lt;&lt; <span class="Constant">&quot;get couldn't find key '&quot;</span> &lt;&lt; key &lt;&lt; <span class="Constant">&quot;'\n&quot;</span><span class="Delimiter">;</span>
-<span id="L231" class="LineNr">231 </span>    assert<span class="Delimiter">(</span>iter != map<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
-<span id="L232" class="LineNr">232 </span>  <span class="Delimiter">}</span>
-<span id="L233" class="LineNr">233 </span>  <span class="Identifier">return</span> iter<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
-<span id="L234" class="LineNr">234 </span><span class="Delimiter">}</span>
-<span id="L235" class="LineNr">235 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> <span class="Special">T</span>&gt; <span class="Normal">typename</span> <span class="Special">T</span>::mapped_type <span class="Normal">const</span>&amp; get<span class="Delimiter">(</span><span class="Normal">const</span> <span class="Special">T</span>&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> <span class="Special">T</span>::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L236" class="LineNr">236 </span>  <span class="Normal">typename</span> <span class="Special">T</span>::const_iterator iter<span class="Delimiter">(</span>map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">));</span>
-<span id="L237" class="LineNr">237 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>iter == map<span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L238" class="LineNr">238 </span>    cerr &lt;&lt; <span class="Constant">&quot;get couldn't find key '&quot;</span> &lt;&lt; key &lt;&lt; <span class="Constant">&quot;'\n&quot;</span><span class="Delimiter">;</span>
-<span id="L239" class="LineNr">239 </span>    assert<span class="Delimiter">(</span>iter != map<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
-<span id="L240" class="LineNr">240 </span>  <span class="Delimiter">}</span>
-<span id="L241" class="LineNr">241 </span>  <span class="Identifier">return</span> iter<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
-<span id="L242" class="LineNr">242 </span><span class="Delimiter">}</span>
-<span id="L243" class="LineNr">243 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> <span class="Special">T</span>&gt; <span class="Normal">typename</span> <span class="Special">T</span>::mapped_type <span class="Normal">const</span>&amp; <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special">T</span>&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> <span class="Special">T</span>::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">,</span> <span class="Normal">typename</span> <span class="Special">T</span>::mapped_type <span class="Normal">const</span>&amp; value<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L244" class="LineNr">244 </span>  map[key] = value<span class="Delimiter">;</span>
-<span id="L245" class="LineNr">245 </span>  <span class="Identifier">return</span> map[key]<span class="Delimiter">;</span>
-<span id="L246" class="LineNr">246 </span><span class="Delimiter">}</span>
-<span id="L247" class="LineNr">247 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> <span class="Special">T</span>&gt; <span class="Normal">bool</span> <a href='001help.cc.html#L247'>contains_key</a><span class="Delimiter">(</span><span class="Special">T</span>&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> <span class="Special">T</span>::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L248" class="LineNr">248 </span>  <span class="Identifier">return</span> map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">)</span> != map<span class="Delimiter">.</span>end<span class="Delimiter">();</span>
-<span id="L249" class="LineNr">249 </span><span class="Delimiter">}</span>
-<span id="L250" class="LineNr">250 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> <span class="Special">T</span>&gt; <span class="Normal">typename</span> <span class="Special">T</span>::mapped_type&amp; <a href='001help.cc.html#L250'>get_or_insert</a><span class="Delimiter">(</span><span class="Special">T</span>&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> <span class="Special">T</span>::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L251" class="LineNr">251 </span>  <span class="Identifier">return</span> map[key]<span class="Delimiter">;</span>
-<span id="L252" class="LineNr">252 </span><span class="Delimiter">}</span>
-<span id="L253" class="LineNr">253 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> <span class="Special">T</span>&gt; <span class="Normal">typename</span> <span class="Special">T</span>::mapped_type <span class="Normal">const</span>&amp; <a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special">T</span>&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> <span class="Special">T</span>::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">,</span> <span class="Normal">typename</span> <span class="Special">T</span>::mapped_type <span class="Normal">const</span>&amp; value<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L254" class="LineNr">254 </span>  assert<span class="Delimiter">(</span>map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">)</span> == map<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
-<span id="L255" class="LineNr">255 </span>  map[key] = value<span class="Delimiter">;</span>
-<span id="L256" class="LineNr">256 </span>  <span class="Identifier">return</span> map[key]<span class="Delimiter">;</span>
-<span id="L257" class="LineNr">257 </span><span class="Delimiter">}</span>
-<span id="L258" class="LineNr">258 </span><span class="Comment">//: The contract: any container that relies on get_or_insert should never call</span>
-<span id="L259" class="LineNr">259 </span><span class="Comment">//: contains_key.</span>
-<span id="L260" class="LineNr">260 </span>
-<span id="L261" class="LineNr">261 </span><span class="Comment">//: 7. istreams are a royal pain in the arse. You have to be careful about</span>
-<span id="L262" class="LineNr">262 </span><span class="Comment">//: what subclass you try to putback into. You have to watch out for the pesky</span>
-<span id="L263" class="LineNr">263 </span><span class="Comment">//: failbit and badbit. Just avoid eof() and use this helper instead.</span>
-<span id="L264" class="LineNr">264 </span><span class="Delimiter">:(code)</span>
-<span id="L265" class="LineNr">265 </span><span class="Normal">bool</span> <a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L266" class="LineNr">266 </span>  <span class="Identifier">return</span> in &amp;&amp; !in<span class="Delimiter">.</span>eof<span class="Delimiter">();</span>
-<span id="L267" class="LineNr">267 </span><span class="Delimiter">}</span>
-<span id="L268" class="LineNr">268 </span>
-<span id="L269" class="LineNr">269 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L270" class="LineNr">270 </span><span class="Comment">#include &lt;assert.h&gt;</span>
-<span id="L271" class="LineNr">271 </span>
-<span id="L272" class="LineNr">272 </span><span class="Comment">#include &lt;iostream&gt;</span>
-<span id="L273" class="LineNr">273 </span><span class="Normal">using</span> std::istream<span class="Delimiter">;</span>
-<span id="L274" class="LineNr">274 </span><span class="Normal">using</span> std::ostream<span class="Delimiter">;</span>
-<span id="L275" class="LineNr">275 </span><span class="Normal">using</span> std::iostream<span class="Delimiter">;</span>
-<span id="L276" class="LineNr">276 </span><span class="Normal">using</span> std::cin<span class="Delimiter">;</span>
-<span id="L277" class="LineNr">277 </span><span class="Normal">using</span> std::cout<span class="Delimiter">;</span>
-<span id="L278" class="LineNr">278 </span><span class="Normal">using</span> std::cerr<span class="Delimiter">;</span>
-<span id="L279" class="LineNr">279 </span><span class="Comment">#include &lt;iomanip&gt;</span>
+<span id="L144" class="LineNr">144 </span><span class="Comment">//: 2. Avoid naked arrays to avoid out-of-bounds access. Never use operator[]</span>
+<span id="L145" class="LineNr">145 </span><span class="Comment">//: except with map. Use at() with STL vectors and so on.</span>
+<span id="L146" class="LineNr">146 </span><span class="Comment">//:</span>
+<span id="L147" class="LineNr">147 </span><span class="Comment">//: 3. Valgrind all the things.</span>
+<span id="L148" class="LineNr">148 </span><span class="Comment">//:</span>
+<span id="L149" class="LineNr">149 </span><span class="Comment">//: 4. Avoid unsigned numbers. Not strictly an undefined-behavior issue, but</span>
+<span id="L150" class="LineNr">150 </span><span class="Comment">//: the extra range doesn't matter, and it's one less confusing category of</span>
+<span id="L151" class="LineNr">151 </span><span class="Comment">//: interaction gotchas to worry about.</span>
+<span id="L152" class="LineNr">152 </span><span class="Comment">//:</span>
+<span id="L153" class="LineNr">153 </span><span class="Comment">//: Corollary: don't use the size() method on containers, since it returns an</span>
+<span id="L154" class="LineNr">154 </span><span class="Comment">//: unsigned and that'll cause warnings about mixing signed and unsigned,</span>
+<span id="L155" class="LineNr">155 </span><span class="Comment">//: yadda-yadda. Instead use this macro below to perform an unsafe cast to</span>
+<span id="L156" class="LineNr">156 </span><span class="Comment">//: signed. We'll just give up immediately if a container's ever too large.</span>
+<span id="L157" class="LineNr">157 </span><span class="Comment">//: Basically, Mu is not concerned about this being a little slower than it</span>
+<span id="L158" class="LineNr">158 </span><span class="Comment">//: could be. (<a href="https://gist.github.com/rygorous/e0f055bfb74e3d5f0af20690759de5a7">https://gist.github.com/rygorous/e0f055bfb74e3d5f0af20690759de5a7</a>)</span>
+<span id="L159" class="LineNr">159 </span><span class="Comment">//:</span>
+<span id="L160" class="LineNr">160 </span><span class="Comment">//: Addendum to corollary: We're going to uniformly use int everywhere, to</span>
+<span id="L161" class="LineNr">161 </span><span class="Comment">//: indicate that we're oblivious to number size, and since Clang on 32-bit</span>
+<span id="L162" class="LineNr">162 </span><span class="Comment">//: platforms doesn't yet support multiplication over 64-bit integers, and</span>
+<span id="L163" class="LineNr">163 </span><span class="Comment">//: since multiplying two integers seems like a more common situation to end</span>
+<span id="L164" class="LineNr">164 </span><span class="Comment">//: up in than integer overflow.</span>
+<span id="L165" class="LineNr">165 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L166" class="LineNr">166 </span><span class="Comment">#define SIZE(X) (assert((X).size() &lt; (1LL&lt;&lt;(sizeof(int)*8-2))), static_cast&lt;int&gt;((X).size()))</span>
+<span id="L167" class="LineNr">167 </span>
+<span id="L168" class="LineNr">168 </span><span class="Comment">//: 5. Integer overflow is guarded against at runtime using the -ftrapv flag</span>
+<span id="L169" class="LineNr">169 </span><span class="Comment">//: to the compiler, supported by Clang (GCC version only works sometimes:</span>
+<span id="L170" class="LineNr">170 </span><span class="Comment">//: <a href="http://stackoverflow.com/questions/20851061/how-to-make-gcc-ftrapv-work">http://stackoverflow.com/questions/20851061/how-to-make-gcc-ftrapv-work</a>).</span>
+<span id="L171" class="LineNr">171 </span><span class="Delimiter">:(before &quot;atexit(reset)&quot;)</span>
+<span id="L172" class="LineNr">172 </span><a href='001help.cc.html#L177'>initialize_signal_handlers</a><span class="Delimiter">();</span>  <span class="Comment">// not always necessary, but doesn't hurt</span>
+<span id="L173" class="LineNr">173 </span><span class="CommentedCode">//? cerr &lt;&lt; INT_MAX+1 &lt;&lt; '\n';  // test overflow</span>
+<span id="L174" class="LineNr">174 </span><span class="CommentedCode">//? assert(false);  // test SIGABRT</span>
+<span id="L175" class="LineNr">175 </span><span class="Delimiter">:(code)</span>
+<span id="L176" class="LineNr">176 </span><span class="Comment">// based on <a href="https://spin.atomicobject.com/2013/01/13/exceptions-stack-traces-c">https://spin.atomicobject.com/2013/01/13/exceptions-stack-traces-c</a></span>
+<span id="L177" class="LineNr">177 </span><span class="Normal">void</span> <a href='001help.cc.html#L177'>initialize_signal_handlers</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L178" class="LineNr">178 </span>  <span class="Normal">struct</span> sigaction action<span class="Delimiter">;</span>
+<span id="L179" class="LineNr">179 </span>  bzero<span class="Delimiter">(</span>&amp;action<span class="Delimiter">,</span> <span class="Normal">sizeof</span><span class="Delimiter">(</span>action<span class="Delimiter">));</span>
+<span id="L180" class="LineNr">180 </span>  action<span class="Delimiter">.</span>sa_sigaction = <a href='001help.cc.html#L185'>dump_and_exit</a><span class="Delimiter">;</span>
+<span id="L181" class="LineNr">181 </span>  sigemptyset<span class="Delimiter">(</span>&amp;action<span class="Delimiter">.</span>sa_mask<span class="Delimiter">);</span>
+<span id="L182" class="LineNr">182 </span>  sigaction<span class="Delimiter">(</span><span class="Constant">SIGABRT</span><span class="Delimiter">,</span> &amp;action<span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">);</span>  <span class="Comment">// assert() failure or integer overflow on linux (with -ftrapv)</span>
+<span id="L183" class="LineNr">183 </span>  sigaction<span class="Delimiter">(</span><span class="Constant">SIGILL</span><span class="Delimiter">,</span>  &amp;action<span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">);</span>  <span class="Comment">// integer overflow on OS X (with -ftrapv)</span>
+<span id="L184" class="LineNr">184 </span><span class="Delimiter">}</span>
+<span id="L185" class="LineNr">185 </span><span class="Normal">void</span> <a href='001help.cc.html#L185'>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="L186" class="LineNr">186 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>sig<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L187" class="LineNr">187 </span>    <span class="Normal">case</span> <span class="Constant">SIGABRT</span>:
+<span id="L188" class="LineNr">188 </span>      <span class="Comment">#ifndef __APPLE__</span>
+<span id="L189" class="LineNr">189 </span>        cerr &lt;&lt; <span class="Constant">&quot;SIGABRT: might be an integer overflow if it wasn't an assert() failure\n&quot;</span><span class="Delimiter">;</span>
+<span id="L190" class="LineNr">190 </span>        _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L191" class="LineNr">191 </span>      <span class="Comment">#endif</span>
+<span id="L192" class="LineNr">192 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L193" class="LineNr">193 </span>    <span class="Normal">case</span> <span class="Constant">SIGILL</span>:
+<span id="L194" class="LineNr">194 </span>      <span class="Comment">#ifdef __APPLE__</span>
+<span id="L195" class="LineNr">195 </span>        cerr &lt;&lt; <span class="Constant">&quot;SIGILL: most likely caused by integer overflow\n&quot;</span><span class="Delimiter">;</span>
+<span id="L196" class="LineNr">196 </span>        _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L197" class="LineNr">197 </span>      <span class="Comment">#endif</span>
+<span id="L198" class="LineNr">198 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L199" class="LineNr">199 </span>    <span class="Normal">default</span>:
+<span id="L200" class="LineNr">200 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Delimiter">}</span>
+<span id="L202" class="LineNr">202 </span><span class="Delimiter">}</span>
+<span id="L203" class="LineNr">203 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L204" class="LineNr">204 </span><span class="Comment">#include &lt;signal.h&gt;</span>
+<span id="L205" class="LineNr">205 </span>
+<span id="L206" class="LineNr">206 </span><span class="Comment">//: For good measure we'll also enable SIGFPE.</span>
+<span id="L207" class="LineNr">207 </span><span class="Delimiter">:(before &quot;atexit(reset)&quot;)</span>
+<span id="L208" class="LineNr">208 </span><a href='001help.cc.html#L221'>feenableexcept</a><span class="Delimiter">(</span>FE_OVERFLOW | FE_UNDERFLOW<span class="Delimiter">);</span>
+<span id="L209" class="LineNr">209 </span><span class="CommentedCode">//? assert(sizeof(int) == 4 &amp;&amp; sizeof(float) == 4);</span>
+<span id="L210" class="LineNr">210 </span><span class="CommentedCode">//? //                          | exp   |  mantissa</span>
+<span id="L211" class="LineNr">211 </span><span class="CommentedCode">//? int smallest_subnormal = 0b00000000000000000000000000000001;</span>
+<span id="L212" class="LineNr">212 </span><span class="CommentedCode">//? float smallest_subnormal_f = *reinterpret_cast&lt;float*&gt;(&amp;smallest_subnormal);</span>
+<span id="L213" class="LineNr">213 </span><span class="CommentedCode">//? cerr &lt;&lt; &quot;ε: &quot; &lt;&lt; smallest_subnormal_f &lt;&lt; '\n';</span>
+<span id="L214" class="LineNr">214 </span><span class="CommentedCode">//? cerr &lt;&lt; &quot;ε/2: &quot; &lt;&lt; smallest_subnormal_f/2 &lt;&lt; &quot; (underflow)\n&quot;;  // test SIGFPE</span>
+<span id="L215" class="LineNr">215 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L216" class="LineNr">216 </span><span class="Comment">#include &lt;fenv.h&gt;</span>
+<span id="L217" class="LineNr">217 </span><span class="Delimiter">:(code)</span>
+<span id="L218" class="LineNr">218 </span><span class="Comment">#ifdef __APPLE__</span>
+<span id="L219" class="LineNr">219 </span><span class="Comment">// Public domain polyfill for feenableexcept on OS X</span>
+<span id="L220" class="LineNr">220 </span><span class="Comment">// <a href="http://www-personal.umich.edu/~williams/archive/computation/fe-handling-example.c">http://www-personal.umich.edu/~williams/archive/computation/fe-handling-example.c</a></span>
+<span id="L221" class="LineNr">221 </span><span class="Normal">int</span> <a href='001help.cc.html#L221'>feenableexcept</a><span class="Delimiter">(</span><span class="Normal">unsigned</span> <span class="Normal">int</span> excepts<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L222" class="LineNr">222 </span>  <span class="Normal">static</span> fenv_t fenv<span class="Delimiter">;</span>
+<span id="L223" class="LineNr">223 </span>  <span class="Normal">unsigned</span> <span class="Normal">int</span> new_excepts = excepts &amp; FE_ALL_EXCEPT<span class="Delimiter">;</span>
+<span id="L224" class="LineNr">224 </span>  <span class="Normal">unsigned</span> <span class="Normal">int</span> old_excepts<span class="Delimiter">;</span>
+<span id="L225" class="LineNr">225 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>fegetenv<span class="Delimiter">(</span>&amp;fenv<span class="Delimiter">))</span> <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L226" class="LineNr">226 </span>  old_excepts = fenv<span class="Delimiter">.</span>__control &amp; FE_ALL_EXCEPT<span class="Delimiter">;</span>
+<span id="L227" class="LineNr">227 </span>  fenv<span class="Delimiter">.</span>__control &amp;= ~new_excepts<span class="Delimiter">;</span>
+<span id="L228" class="LineNr">228 </span>  fenv<span class="Delimiter">.</span>__mxcsr &amp;= ~<span class="Delimiter">(</span>new_excepts &lt;&lt; <span class="Constant">7</span><span class="Delimiter">);</span>
+<span id="L229" class="LineNr">229 </span>  <span class="Identifier">return</span> fesetenv<span class="Delimiter">(</span>&amp;fenv<span class="Delimiter">)</span> ? -<span class="Constant">1</span> : old_excepts<span class="Delimiter">;</span>
+<span id="L230" class="LineNr">230 </span><span class="Delimiter">}</span>
+<span id="L231" class="LineNr">231 </span><span class="Comment">#endif</span>
+<span id="L232" class="LineNr">232 </span>
+<span id="L233" class="LineNr">233 </span><span class="Comment">//: 6. Map's operator[] being non-const is fucking evil.</span>
+<span id="L234" class="LineNr">234 </span><span class="Delimiter">:(before &quot;Globals&quot;)</span>  <span class="Comment">// can't generate prototypes for these</span>
+<span id="L235" class="LineNr">235 </span><span class="Comment">// from <a href="http://stackoverflow.com/questions/152643/idiomatic-c-for-reading-from-a-const-map">http://stackoverflow.com/questions/152643/idiomatic-c-for-reading-from-a-const-map</a></span>
+<span id="L236" class="LineNr">236 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> <span class="Special">T</span>&gt; <span class="Normal">typename</span> <span class="Special">T</span>::mapped_type&amp; get<span class="Delimiter">(</span><span class="Special">T</span>&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> <span class="Special">T</span>::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L237" class="LineNr">237 </span>  <span class="Normal">typename</span> <span class="Special">T</span>::iterator iter<span class="Delimiter">(</span>map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">));</span>
+<span id="L238" class="LineNr">238 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>iter == map<span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L239" class="LineNr">239 </span>    cerr &lt;&lt; <span class="Constant">&quot;get couldn't find key '&quot;</span> &lt;&lt; key &lt;&lt; <span class="Constant">&quot;'\n&quot;</span><span class="Delimiter">;</span>
+<span id="L240" class="LineNr">240 </span>    assert<span class="Delimiter">(</span>iter != map<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L241" class="LineNr">241 </span>  <span class="Delimiter">}</span>
+<span id="L242" class="LineNr">242 </span>  <span class="Identifier">return</span> iter<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
+<span id="L243" class="LineNr">243 </span><span class="Delimiter">}</span>
+<span id="L244" class="LineNr">244 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> <span class="Special">T</span>&gt; <span class="Normal">typename</span> <span class="Special">T</span>::mapped_type <span class="Normal">const</span>&amp; get<span class="Delimiter">(</span><span class="Normal">const</span> <span class="Special">T</span>&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> <span class="Special">T</span>::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L245" class="LineNr">245 </span>  <span class="Normal">typename</span> <span class="Special">T</span>::const_iterator iter<span class="Delimiter">(</span>map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">));</span>
+<span id="L246" class="LineNr">246 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>iter == map<span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L247" class="LineNr">247 </span>    cerr &lt;&lt; <span class="Constant">&quot;get couldn't find key '&quot;</span> &lt;&lt; key &lt;&lt; <span class="Constant">&quot;'\n&quot;</span><span class="Delimiter">;</span>
+<span id="L248" class="LineNr">248 </span>    assert<span class="Delimiter">(</span>iter != map<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L249" class="LineNr">249 </span>  <span class="Delimiter">}</span>
+<span id="L250" class="LineNr">250 </span>  <span class="Identifier">return</span> iter<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
+<span id="L251" class="LineNr">251 </span><span class="Delimiter">}</span>
+<span id="L252" class="LineNr">252 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> <span class="Special">T</span>&gt; <span class="Normal">typename</span> <span class="Special">T</span>::mapped_type <span class="Normal">const</span>&amp; <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special">T</span>&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> <span class="Special">T</span>::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">,</span> <span class="Normal">typename</span> <span class="Special">T</span>::mapped_type <span class="Normal">const</span>&amp; value<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L253" class="LineNr">253 </span>  map[key] = value<span class="Delimiter">;</span>
+<span id="L254" class="LineNr">254 </span>  <span class="Identifier">return</span> map[key]<span class="Delimiter">;</span>
+<span id="L255" class="LineNr">255 </span><span class="Delimiter">}</span>
+<span id="L256" class="LineNr">256 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> <span class="Special">T</span>&gt; <span class="Normal">bool</span> <a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span><span class="Special">T</span>&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> <span class="Special">T</span>::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L257" class="LineNr">257 </span>  <span class="Identifier">return</span> map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">)</span> != map<span class="Delimiter">.</span>end<span class="Delimiter">();</span>
+<span id="L258" class="LineNr">258 </span><span class="Delimiter">}</span>
+<span id="L259" class="LineNr">259 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> <span class="Special">T</span>&gt; <span class="Normal">typename</span> <span class="Special">T</span>::mapped_type&amp; <a href='001help.cc.html#L259'>get_or_insert</a><span class="Delimiter">(</span><span class="Special">T</span>&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> <span class="Special">T</span>::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L260" class="LineNr">260 </span>  <span class="Identifier">return</span> map[key]<span class="Delimiter">;</span>
+<span id="L261" class="LineNr">261 </span><span class="Delimiter">}</span>
+<span id="L262" class="LineNr">262 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> <span class="Special">T</span>&gt; <span class="Normal">typename</span> <span class="Special">T</span>::mapped_type <span class="Normal">const</span>&amp; <a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special">T</span>&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> <span class="Special">T</span>::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">,</span> <span class="Normal">typename</span> <span class="Special">T</span>::mapped_type <span class="Normal">const</span>&amp; value<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L263" class="LineNr">263 </span>  assert<span class="Delimiter">(</span>map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">)</span> == map<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L264" class="LineNr">264 </span>  map[key] = value<span class="Delimiter">;</span>
+<span id="L265" class="LineNr">265 </span>  <span class="Identifier">return</span> map[key]<span class="Delimiter">;</span>
+<span id="L266" class="LineNr">266 </span><span class="Delimiter">}</span>
+<span id="L267" class="LineNr">267 </span><span class="Comment">//: The contract: any container that relies on get_or_insert should never call</span>
+<span id="L268" class="LineNr">268 </span><span class="Comment">//: contains_key.</span>
+<span id="L269" class="LineNr">269 </span>
+<span id="L270" class="LineNr">270 </span><span class="Comment">//: 7. istreams are a royal pain in the arse. You have to be careful about</span>
+<span id="L271" class="LineNr">271 </span><span class="Comment">//: what subclass you try to putback into. You have to watch out for the pesky</span>
+<span id="L272" class="LineNr">272 </span><span class="Comment">//: failbit and badbit. Just avoid eof() and use this helper instead.</span>
+<span id="L273" class="LineNr">273 </span><span class="Delimiter">:(code)</span>
+<span id="L274" class="LineNr">274 </span><span class="Normal">bool</span> <a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L275" class="LineNr">275 </span>  <span class="Identifier">return</span> in &amp;&amp; !in<span class="Delimiter">.</span>eof<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="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L279" class="LineNr">279 </span><span class="Comment">#include &lt;assert.h&gt;</span>
 <span id="L280" class="LineNr">280 </span>
-<span id="L281" class="LineNr">281 </span><span class="Comment">#include &lt;string.h&gt;</span>
-<span id="L282" class="LineNr">282 </span><span class="Comment">#include &lt;string&gt;</span>
-<span id="L283" class="LineNr">283 </span><span class="Normal">using</span> std::string<span class="Delimiter">;</span>
-<span id="L284" class="LineNr">284 </span>
-<span id="L285" class="LineNr">285 </span><span class="Comment">#include &lt;algorithm&gt;</span>
-<span id="L286" class="LineNr">286 </span><span class="Normal">using</span> std::min<span class="Delimiter">;</span>
-<span id="L287" class="LineNr">287 </span><span class="Normal">using</span> std::max<span class="Delimiter">;</span>
+<span id="L281" class="LineNr">281 </span><span class="Comment">#include &lt;iostream&gt;</span>
+<span id="L282" class="LineNr">282 </span><span class="Normal">using</span> std::istream<span class="Delimiter">;</span>
+<span id="L283" class="LineNr">283 </span><span class="Normal">using</span> std::ostream<span class="Delimiter">;</span>
+<span id="L284" class="LineNr">284 </span><span class="Normal">using</span> std::iostream<span class="Delimiter">;</span>
+<span id="L285" class="LineNr">285 </span><span class="Normal">using</span> std::cin<span class="Delimiter">;</span>
+<span id="L286" class="LineNr">286 </span><span class="Normal">using</span> std::cout<span class="Delimiter">;</span>
+<span id="L287" class="LineNr">287 </span><span class="Normal">using</span> std::cerr<span class="Delimiter">;</span>
+<span id="L288" class="LineNr">288 </span><span class="Comment">#include &lt;iomanip&gt;</span>
+<span id="L289" class="LineNr">289 </span>
+<span id="L290" class="LineNr">290 </span><span class="Comment">#include &lt;string.h&gt;</span>
+<span id="L291" class="LineNr">291 </span><span class="Comment">#include &lt;string&gt;</span>
+<span id="L292" class="LineNr">292 </span><span class="Normal">using</span> std::string<span class="Delimiter">;</span>
+<span id="L293" class="LineNr">293 </span>
+<span id="L294" class="LineNr">294 </span><span class="Comment">#include &lt;algorithm&gt;</span>
+<span id="L295" class="LineNr">295 </span><span class="Normal">using</span> std::min<span class="Delimiter">;</span>
+<span id="L296" class="LineNr">296 </span><span class="Normal">using</span> std::max<span class="Delimiter">;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/002test.cc.html b/html/subx/002test.cc.html
index 6927f559..ebfcba7b 100644
--- a/html/subx/002test.cc.html
+++ b/html/subx/002test.cc.html
@@ -104,7 +104,7 @@ if ('onhashchange' in window) {
 <span id="L40" class="LineNr"> 40 </span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L41" class="LineNr"> 41 </span>
 <span id="L42" class="LineNr"> 42 </span><span class="Delimiter">:(before &quot;End Commandline Parsing&quot;)</span>
-<span id="L43" class="LineNr"> 43 </span><span class="Normal">if</span> <span class="Delimiter">(</span>argc &gt; <span class="Constant">1</span> &amp;&amp; <a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;test&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L43" class="LineNr"> 43 </span><span class="Normal">if</span> <span class="Delimiter">(</span>argc &gt; <span class="Constant">1</span> &amp;&amp; <a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;test&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L44" class="LineNr"> 44 </span>  <span class="Special"><a href='002test.cc.html#L20'>Run_tests</a></span> =<span class="Constant"> true</span><span class="Delimiter">;</span>  --argc<span class="Delimiter">;</span>  ++argv<span class="Delimiter">;</span>  <span class="Comment">// shift 'test' out of commandline args</span>
 <span id="L45" class="LineNr"> 45 </span><span class="Delimiter">}</span>
 <span id="L46" class="LineNr"> 46 </span>
diff --git a/html/subx/003trace.cc.html b/html/subx/003trace.cc.html
index 860b3575..f341f57b 100644
--- a/html/subx/003trace.cc.html
+++ b/html/subx/003trace.cc.html
@@ -139,353 +139,329 @@ if ('onhashchange' in window) {
 <span id="L76" class="LineNr"> 76 </span>  trace_line<span class="Delimiter">(</span><span class="Normal">int</span> d<span class="Delimiter">,</span> string l<span class="Delimiter">,</span> string c<span class="Delimiter">)</span> :<a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">(</span>d<span class="Delimiter">),</span> label<span class="Delimiter">(</span>l<span class="Delimiter">),</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">(</span>c<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
 <span id="L77" class="LineNr"> 77 </span><span class="Delimiter">};</span>
 <span id="L78" class="LineNr"> 78 </span>
-<span id="L79" class="LineNr"> 79 </span><span class="Comment">//: Support for tracing an entire run.</span>
-<span id="L80" class="LineNr"> 80 </span><span class="Comment">//: Traces can have a lot of overhead, so only turn them on when asked.</span>
-<span id="L81" class="LineNr"> 81 </span><span class="Delimiter">:(before &quot;End Commandline Options(*arg)&quot;)</span>
-<span id="L82" class="LineNr"> 82 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--trace&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Special"><a href='003trace.cc.html#L237'>Save_trace</a></span> =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L79" class="LineNr"> 79 </span><span class="Delimiter">:(code)</span>
+<span id="L80" class="LineNr"> 80 </span><span class="Normal">void</span> <a href='003trace.cc.html#L80'>cleanup_main</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="Normal">delete</span> <span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">;</span>
+<span id="L83" class="LineNr"> 83 </span>  <span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
 <span id="L84" class="LineNr"> 84 </span><span class="Delimiter">}</span>
-<span id="L85" class="LineNr"> 85 </span><span class="Delimiter">:(before &quot;End Commandline Parsing&quot;)</span>
-<span id="L86" class="LineNr"> 86 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L237'>Save_trace</a></span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L87" class="LineNr"> 87 </span>  cerr &lt;&lt; <span class="Constant">&quot;initializing trace\n&quot;</span><span class="Delimiter">;</span>
-<span id="L88" class="LineNr"> 88 </span>  <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span> = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span>
-<span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span>
-<span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(code)</span>
-<span id="L91" class="LineNr"> 91 </span><span class="Normal">void</span> <a href='003trace.cc.html#L91'>cleanup_main</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L92" class="LineNr"> 92 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L237'>Save_trace</a></span><span class="Delimiter">)</span>
-<span id="L94" class="LineNr"> 94 </span>    <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L133'>save</a><span class="Delimiter">();</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="Normal">delete</span> <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">;</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span> = <span class="Constant">NULL</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="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L99" class="LineNr"> 99 </span>atexit<span class="Delimiter">(</span><a href='003trace.cc.html#L91'>cleanup_main</a><span class="Delimiter">);</span>
-<span id="L100" class="LineNr">100 </span>
-<span id="L101" class="LineNr">101 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L102" class="LineNr">102 </span><span class="Comment">// Pre-define some global constants that trace_stream needs to know about.</span>
-<span id="L103" class="LineNr">103 </span><span class="Comment">// Since they're in the Types section, they'll be included in any cleaved</span>
-<span id="L104" class="LineNr">104 </span><span class="Comment">// compilation units. So no extern linkage.</span>
-<span id="L105" class="LineNr">105 </span><span class="Normal">const</span> <span class="Normal">int</span> <span class="Special"><a href='003trace.cc.html#L105'>Max_depth</a></span> = <span class="Constant">9999</span><span class="Delimiter">;</span>
-<span id="L106" class="LineNr">106 </span><span class="Normal">const</span> <span class="Normal">int</span> <span class="Special"><a href='003trace.cc.html#L106'>Error_depth</a></span> = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// definitely always print errors</span>
-<span id="L107" class="LineNr">107 </span><span class="Normal">const</span> <span class="Normal">int</span> <span class="Special"><a href='003trace.cc.html#L107'>Warn_depth</a></span> = <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L108" class="LineNr">108 </span>
-<span id="L109" class="LineNr">109 </span><span class="Normal">struct</span> trace_stream <span class="Delimiter">{</span>
-<span id="L110" class="LineNr">110 </span>  vector&lt;trace_line&gt; <a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">;</span>
-<span id="L111" class="LineNr">111 </span>  <span class="Comment">// accumulator for current line</span>
-<span id="L112" class="LineNr">112 </span>  ostringstream* <a href='003trace.cc.html#L112'>curr_stream</a><span class="Delimiter">;</span>
-<span id="L113" class="LineNr">113 </span>  string <a href='003trace.cc.html#L113'>curr_label</a><span class="Delimiter">;</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Normal">int</span> <a href='003trace.cc.html#L114'>curr_depth</a><span class="Delimiter">;</span>
-<span id="L115" class="LineNr">115 </span>  <span class="Normal">int</span> <a href='003trace.cc.html#L115'>collect_depth</a><span class="Delimiter">;</span>
-<span id="L116" class="LineNr">116 </span>  ofstream<span class="Constant"> null</span>_stream<span class="Delimiter">;</span>  <span class="Comment">// never opens a file, so writes silently fail</span>
-<span id="L117" class="LineNr">117 </span>  trace_stream<span class="Delimiter">()</span> :<a href='003trace.cc.html#L112'>curr_stream</a><span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> <a href='003trace.cc.html#L114'>curr_depth</a><span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L105'>Max_depth</a></span><span class="Delimiter">),</span> <a href='003trace.cc.html#L115'>collect_depth</a><span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L105'>Max_depth</a></span><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L118" class="LineNr">118 </span>  <a href='003trace.cc.html#L118'>~trace_stream</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L112'>curr_stream</a><span class="Delimiter">)</span> <span class="Normal">delete</span> <a href='003trace.cc.html#L112'>curr_stream</a><span class="Delimiter">;</span> <span class="Delimiter">}</span>
+<span id="L85" class="LineNr"> 85 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L86" class="LineNr"> 86 </span>atexit<span class="Delimiter">(</span><a href='003trace.cc.html#L80'>cleanup_main</a><span class="Delimiter">);</span>
+<span id="L87" class="LineNr"> 87 </span>
+<span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L89" class="LineNr"> 89 </span><span class="Comment">// Pre-define some global constants that trace_stream needs to know about.</span>
+<span id="L90" class="LineNr"> 90 </span><span class="Comment">// Since they're in the Types section, they'll be included in any cleaved</span>
+<span id="L91" class="LineNr"> 91 </span><span class="Comment">// compilation units. So no extern linkage.</span>
+<span id="L92" class="LineNr"> 92 </span><span class="Normal">const</span> <span class="Normal">int</span> <span class="Special"><a href='003trace.cc.html#L92'>Max_depth</a></span> = <span class="Constant">9999</span><span class="Delimiter">;</span>
+<span id="L93" class="LineNr"> 93 </span><span class="Normal">const</span> <span class="Normal">int</span> <span class="Special"><a href='003trace.cc.html#L93'>Error_depth</a></span> = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// definitely always print errors</span>
+<span id="L94" class="LineNr"> 94 </span><span class="Normal">const</span> <span class="Normal">int</span> <span class="Special"><a href='003trace.cc.html#L94'>Warn_depth</a></span> = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L95" class="LineNr"> 95 </span>
+<span id="L96" class="LineNr"> 96 </span><span class="Normal">struct</span> trace_stream <span class="Delimiter">{</span>
+<span id="L97" class="LineNr"> 97 </span>  vector&lt;trace_line&gt; <a href='003trace.cc.html#L97'>past_lines</a><span class="Delimiter">;</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="Comment">// accumulator for current line</span>
+<span id="L99" class="LineNr"> 99 </span>  ostringstream* <a href='003trace.cc.html#L99'>curr_stream</a><span class="Delimiter">;</span>
+<span id="L100" class="LineNr">100 </span>  string <a href='003trace.cc.html#L100'>curr_label</a><span class="Delimiter">;</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Normal">int</span> <a href='003trace.cc.html#L101'>curr_depth</a><span class="Delimiter">;</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Normal">int</span> <a href='003trace.cc.html#L102'>collect_depth</a><span class="Delimiter">;</span>
+<span id="L103" class="LineNr">103 </span>  ofstream<span class="Constant"> null</span>_stream<span class="Delimiter">;</span>  <span class="Comment">// never opens a file, so writes silently fail</span>
+<span id="L104" class="LineNr">104 </span>  trace_stream<span class="Delimiter">()</span> :<a href='003trace.cc.html#L99'>curr_stream</a><span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> <a href='003trace.cc.html#L101'>curr_depth</a><span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L92'>Max_depth</a></span><span class="Delimiter">),</span> <a href='003trace.cc.html#L102'>collect_depth</a><span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L92'>Max_depth</a></span><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L105" class="LineNr">105 </span>  <a href='003trace.cc.html#L105'>~trace_stream</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L99'>curr_stream</a><span class="Delimiter">)</span> <span class="Normal">delete</span> <a href='003trace.cc.html#L99'>curr_stream</a><span class="Delimiter">;</span> <span class="Delimiter">}</span>
+<span id="L106" class="LineNr">106 </span>
+<span id="L107" class="LineNr">107 </span>  ostream&amp; stream<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L108" class="LineNr">108 </span>    <span class="Identifier">return</span> stream<span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L92'>Max_depth</a></span><span class="Delimiter">,</span> label<span class="Delimiter">);</span>
+<span id="L109" class="LineNr">109 </span>  <span class="Delimiter">}</span>
+<span id="L110" class="LineNr">110 </span>
+<span id="L111" class="LineNr">111 </span>  ostream&amp; stream<span class="Delimiter">(</span><span class="Normal">int</span> <a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">,</span> string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L112" class="LineNr">112 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L72'>depth</a> &gt; <a href='003trace.cc.html#L102'>collect_depth</a><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> null</span>_stream<span class="Delimiter">;</span>
+<span id="L113" class="LineNr">113 </span>    <a href='003trace.cc.html#L99'>curr_stream</a> = <span class="Normal">new</span> ostringstream<span class="Delimiter">;</span>
+<span id="L114" class="LineNr">114 </span>    <a href='003trace.cc.html#L100'>curr_label</a> = label<span class="Delimiter">;</span>
+<span id="L115" class="LineNr">115 </span>    <a href='003trace.cc.html#L101'>curr_depth</a> = <a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">;</span>
+<span id="L116" class="LineNr">116 </span>    <span class="Delimiter">(</span>*curr_stream<span class="Delimiter">)</span> &lt;&lt; std::hex<span class="Delimiter">;</span>
+<span id="L117" class="LineNr">117 </span>    <span class="Identifier">return</span> *curr_stream<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>  ostream&amp; stream<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L121" class="LineNr">121 </span>    <span class="Identifier">return</span> stream<span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L105'>Max_depth</a></span><span class="Delimiter">,</span> label<span class="Delimiter">);</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Delimiter">}</span>
-<span id="L123" class="LineNr">123 </span>
-<span id="L124" class="LineNr">124 </span>  ostream&amp; stream<span class="Delimiter">(</span><span class="Normal">int</span> <a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">,</span> string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L125" class="LineNr">125 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L72'>depth</a> &gt; <a href='003trace.cc.html#L115'>collect_depth</a><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> null</span>_stream<span class="Delimiter">;</span>
-<span id="L126" class="LineNr">126 </span>    <a href='003trace.cc.html#L112'>curr_stream</a> = <span class="Normal">new</span> ostringstream<span class="Delimiter">;</span>
-<span id="L127" class="LineNr">127 </span>    <a href='003trace.cc.html#L113'>curr_label</a> = label<span class="Delimiter">;</span>
-<span id="L128" class="LineNr">128 </span>    <a href='003trace.cc.html#L114'>curr_depth</a> = <a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">;</span>
-<span id="L129" class="LineNr">129 </span>    <span class="Delimiter">(</span>*curr_stream<span class="Delimiter">)</span> &lt;&lt; std::hex<span class="Delimiter">;</span>
-<span id="L130" class="LineNr">130 </span>    <span class="Identifier">return</span> *curr_stream<span class="Delimiter">;</span>
-<span id="L131" class="LineNr">131 </span>  <span class="Delimiter">}</span>
-<span id="L132" class="LineNr">132 </span>
-<span id="L133" class="LineNr">133 </span>  <span class="Normal">void</span> <a href='003trace.cc.html#L133'>save</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L134" class="LineNr">134 </span>    cerr &lt;&lt; <span class="Constant">&quot;saving <a href='003trace.cc.html#L203'>trace</a> to 'last_run'\n&quot;</span><span class="Delimiter">;</span>
-<span id="L135" class="LineNr">135 </span>    ofstream fout<span class="Delimiter">(</span><span class="Constant">&quot;last_run&quot;</span><span class="Delimiter">);</span>
-<span id="L136" class="LineNr">136 </span>    fout &lt;&lt; <a href='003trace.cc.html#L164'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L137" class="LineNr">137 </span>    fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
-<span id="L138" class="LineNr">138 </span>  <span class="Delimiter">}</span>
-<span id="L139" class="LineNr">139 </span>
-<span id="L140" class="LineNr">140 </span>  <span class="Comment">// be sure to call this before messing with curr_stream or curr_label</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Normal">void</span> <a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Comment">// useful for debugging</span>
-<span id="L143" class="LineNr">143 </span>  string <a href='003trace.cc.html#L164'>readable_contents</a><span class="Delimiter">(</span>string label<span class="Delimiter">);</span>  <span class="Comment">// empty label = show everything</span>
-<span id="L144" class="LineNr">144 </span><span class="Delimiter">};</span>
-<span id="L145" class="LineNr">145 </span>
-<span id="L146" class="LineNr">146 </span><span class="Delimiter">:(code)</span>
-<span id="L147" class="LineNr">147 </span><span class="Normal">void</span> trace_stream::<a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L149" class="LineNr">149 </span>  string curr_contents = <a href='003trace.cc.html#L112'>curr_stream</a><span class="Delimiter">-&gt;</span>str<span class="Delimiter">();</span>
-<span id="L150" class="LineNr">150 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_contents<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L151" class="LineNr">151 </span>    <a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span><a href='003trace.cc.html#L114'>curr_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L113'>curr_label</a><span class="Delimiter">),</span> curr_contents<span class="Delimiter">));</span>  <span class="Comment">// preserve indent in contents</span>
-<span id="L152" class="LineNr">152 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>!<span class="Special">Hide_errors</span> &amp;&amp; <a href='003trace.cc.html#L114'>curr_depth</a> == <span class="Special"><a href='003trace.cc.html#L106'>Error_depth</a></span><span class="Delimiter">)</span>
-<span id="L153" class="LineNr">153 </span>        || <span class="Delimiter">(</span>!<span class="Special">Hide_warnings</span> &amp;&amp; !<span class="Special">Hide_errors</span> &amp;&amp; <a href='003trace.cc.html#L114'>curr_depth</a> == <span class="Special"><a href='003trace.cc.html#L107'>Warn_depth</a></span><span class="Delimiter">)</span>
-<span id="L154" class="LineNr">154 </span>        || <span class="Special"><a href='003trace.cc.html#L188'>Dump_trace</a></span>
-<span id="L155" class="LineNr">155 </span>        || <span class="Delimiter">(</span>!<span class="Special"><a href='003trace.cc.html#L189'>Dump_label</a></span><span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; <a href='003trace.cc.html#L113'>curr_label</a> == <span class="Special"><a href='003trace.cc.html#L189'>Dump_label</a></span><span class="Delimiter">))</span>
-<span id="L156" class="LineNr">156 </span>      cerr &lt;&lt; <a href='003trace.cc.html#L113'>curr_label</a> &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; curr_contents &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Delimiter">}</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Normal">delete</span> <a href='003trace.cc.html#L112'>curr_stream</a><span class="Delimiter">;</span>
-<span id="L159" class="LineNr">159 </span>  <a href='003trace.cc.html#L112'>curr_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L160" class="LineNr">160 </span>  <a href='003trace.cc.html#L113'>curr_label</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
-<span id="L161" class="LineNr">161 </span>  <a href='003trace.cc.html#L114'>curr_depth</a> = <span class="Special"><a href='003trace.cc.html#L105'>Max_depth</a></span><span class="Delimiter">;</span>
-<span id="L162" class="LineNr">162 </span><span class="Delimiter">}</span>
-<span id="L163" class="LineNr">163 </span>
-<span id="L164" class="LineNr">164 </span>string trace_stream::<a href='003trace.cc.html#L164'>readable_contents</a><span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L165" class="LineNr">165 </span>  ostringstream output<span class="Delimiter">;</span>
-<span id="L166" class="LineNr">166 </span>  label = <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
-<span id="L167" class="LineNr">167 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L168" class="LineNr">168 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span>
-<span id="L169" class="LineNr">169 </span>      output &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">4</span><span class="Delimiter">)</span> &lt;&lt; p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L72'>depth</a> &lt;&lt; <span class="Constant">' '</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L170" class="LineNr">170 </span>  <span class="Identifier">return</span> output<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L171" class="LineNr">171 </span><span class="Delimiter">}</span>
-<span id="L172" class="LineNr">172 </span>
-<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L174" class="LineNr">174 </span>trace_stream* <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L175" class="LineNr">175 </span><span class="Normal">int</span> <span class="Special"><a href='003trace.cc.html#L175'>Trace_errors</a></span> = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// used only when Trace_stream is NULL</span>
-<span id="L176" class="LineNr">176 </span>
-<span id="L177" class="LineNr">177 </span><span class="Comment">//: option to print trace to the screen</span>
-<span id="L178" class="LineNr">178 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L179" class="LineNr">179 </span><span class="Normal">bool</span> <span class="Special"><a href='003trace.cc.html#L179'>Flag_dump_trace</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L180" class="LineNr">180 </span><span class="Delimiter">:(before &quot;End Commandline Options(*arg)&quot;)</span>
-<span id="L181" class="LineNr">181 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--dump&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L182" class="LineNr">182 </span>  <span class="Special"><a href='003trace.cc.html#L179'>Flag_dump_trace</a></span> =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span>
+<span id="L120" class="LineNr">120 </span>  <span class="Comment">// be sure to call this before messing with curr_stream or curr_label</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Normal">void</span> <a href='003trace.cc.html#L127'>newline</a><span class="Delimiter">();</span>
+<span id="L122" class="LineNr">122 </span>  <span class="Comment">// useful for debugging</span>
+<span id="L123" class="LineNr">123 </span>  string <a href='003trace.cc.html#L144'>readable_contents</a><span class="Delimiter">(</span>string label<span class="Delimiter">);</span>  <span class="Comment">// empty label = show everything</span>
+<span id="L124" class="LineNr">124 </span><span class="Delimiter">};</span>
+<span id="L125" class="LineNr">125 </span>
+<span id="L126" class="LineNr">126 </span><span class="Delimiter">:(code)</span>
+<span id="L127" class="LineNr">127 </span><span class="Normal">void</span> trace_stream::<a href='003trace.cc.html#L127'>newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L128" class="LineNr">128 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L129" class="LineNr">129 </span>  string curr_contents = <a href='003trace.cc.html#L99'>curr_stream</a><span class="Delimiter">-&gt;</span>str<span class="Delimiter">();</span>
+<span id="L130" class="LineNr">130 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_contents<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L131" class="LineNr">131 </span>    <a href='003trace.cc.html#L97'>past_lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span><a href='003trace.cc.html#L101'>curr_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L100'>curr_label</a><span class="Delimiter">),</span> curr_contents<span class="Delimiter">));</span>  <span class="Comment">// preserve indent in contents</span>
+<span id="L132" class="LineNr">132 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>!<span class="Special">Hide_errors</span> &amp;&amp; <a href='003trace.cc.html#L101'>curr_depth</a> == <span class="Special"><a href='003trace.cc.html#L93'>Error_depth</a></span><span class="Delimiter">)</span>
+<span id="L133" class="LineNr">133 </span>        || <span class="Delimiter">(</span>!<span class="Special">Hide_warnings</span> &amp;&amp; !<span class="Special">Hide_errors</span> &amp;&amp; <a href='003trace.cc.html#L101'>curr_depth</a> == <span class="Special"><a href='003trace.cc.html#L94'>Warn_depth</a></span><span class="Delimiter">)</span>
+<span id="L134" class="LineNr">134 </span>        || <span class="Special"><a href='003trace.cc.html#L168'>Dump_trace</a></span>
+<span id="L135" class="LineNr">135 </span>        || <span class="Delimiter">(</span>!<span class="Special"><a href='003trace.cc.html#L169'>Dump_label</a></span><span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; <a href='003trace.cc.html#L100'>curr_label</a> == <span class="Special"><a href='003trace.cc.html#L169'>Dump_label</a></span><span class="Delimiter">))</span>
+<span id="L136" class="LineNr">136 </span>      cerr &lt;&lt; <a href='003trace.cc.html#L100'>curr_label</a> &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; curr_contents &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Delimiter">}</span>
+<span id="L138" class="LineNr">138 </span>  <span class="Normal">delete</span> <a href='003trace.cc.html#L99'>curr_stream</a><span class="Delimiter">;</span>
+<span id="L139" class="LineNr">139 </span>  <a href='003trace.cc.html#L99'>curr_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L140" class="LineNr">140 </span>  <a href='003trace.cc.html#L100'>curr_label</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
+<span id="L141" class="LineNr">141 </span>  <a href='003trace.cc.html#L101'>curr_depth</a> = <span class="Special"><a href='003trace.cc.html#L92'>Max_depth</a></span><span class="Delimiter">;</span>
+<span id="L142" class="LineNr">142 </span><span class="Delimiter">}</span>
+<span id="L143" class="LineNr">143 </span>
+<span id="L144" class="LineNr">144 </span>string trace_stream::<a href='003trace.cc.html#L144'>readable_contents</a><span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L145" class="LineNr">145 </span>  ostringstream output<span class="Delimiter">;</span>
+<span id="L146" class="LineNr">146 </span>  label = <a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L147" class="LineNr">147 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L97'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L97'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L148" class="LineNr">148 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span>
+<span id="L149" class="LineNr">149 </span>      output &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">4</span><span class="Delimiter">)</span> &lt;&lt; p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L72'>depth</a> &lt;&lt; <span class="Constant">' '</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Identifier">return</span> output<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L151" class="LineNr">151 </span><span class="Delimiter">}</span>
+<span id="L152" class="LineNr">152 </span>
+<span id="L153" class="LineNr">153 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L154" class="LineNr">154 </span>trace_stream* <span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L155" class="LineNr">155 </span><span class="Normal">int</span> <span class="Special"><a href='003trace.cc.html#L155'>Trace_errors</a></span> = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// used only when Trace_stream is NULL</span>
+<span id="L156" class="LineNr">156 </span>
+<span id="L157" class="LineNr">157 </span><span class="Comment">//: commandline flag to print trace incrementally to stderr</span>
+<span id="L158" class="LineNr">158 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L159" class="LineNr">159 </span><span class="Normal">bool</span> <span class="Special"><a href='003trace.cc.html#L159'>Flag_dump_trace</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L160" class="LineNr">160 </span><span class="Delimiter">:(before &quot;End Commandline Options(*arg)&quot;)</span>
+<span id="L161" class="LineNr">161 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--trace&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Special"><a href='003trace.cc.html#L159'>Flag_dump_trace</a></span> =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L163" class="LineNr">163 </span><span class="Delimiter">}</span>
+<span id="L164" class="LineNr">164 </span>
+<span id="L165" class="LineNr">165 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L166" class="LineNr">166 </span><span class="Normal">bool</span> <span class="Special">Hide_errors</span> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, don't print even error trace lines to screen</span>
+<span id="L167" class="LineNr">167 </span><span class="Normal">bool</span> <span class="Special">Hide_warnings</span> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, don't print warnings to screen</span>
+<span id="L168" class="LineNr">168 </span><span class="Normal">bool</span> <span class="Special"><a href='003trace.cc.html#L168'>Dump_trace</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, print trace lines to screen</span>
+<span id="L169" class="LineNr">169 </span>string <span class="Special"><a href='003trace.cc.html#L169'>Dump_label</a></span> = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// if set, print trace lines matching a single label to screen</span>
+<span id="L170" class="LineNr">170 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L171" class="LineNr">171 </span><span class="Special">Hide_errors</span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L172" class="LineNr">172 </span><span class="Special">Hide_warnings</span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L173" class="LineNr">173 </span><span class="Special"><a href='003trace.cc.html#L168'>Dump_trace</a></span> = <span class="Special"><a href='003trace.cc.html#L159'>Flag_dump_trace</a></span><span class="Delimiter">;</span>
+<span id="L174" class="LineNr">174 </span><span class="Special"><a href='003trace.cc.html#L169'>Dump_label</a></span> = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L175" class="LineNr">175 </span><span class="Comment">//: Never dump warnings in scenarios</span>
+<span id="L176" class="LineNr">176 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
+<span id="L177" class="LineNr">177 </span><span class="Special">Hide_warnings</span> =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L178" class="LineNr">178 </span>
+<span id="L179" class="LineNr">179 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L180" class="LineNr">180 </span><span class="Comment">#define CLEAR_TRACE  delete Trace_stream, Trace_stream = new trace_stream;</span>
+<span id="L181" class="LineNr">181 </span>
+<span id="L182" class="LineNr">182 </span><span class="Comment">// Top-level helper. IMPORTANT: can't nest</span>
+<span id="L183" class="LineNr">183 </span><span class="Comment">#define trace(...)  !Trace_stream ? cerr /*print nothing*/ : Trace_stream-&gt;stream(__VA_ARGS__)</span>
 <span id="L184" class="LineNr">184 </span>
-<span id="L185" class="LineNr">185 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L186" class="LineNr">186 </span><span class="Normal">bool</span> <span class="Special">Hide_errors</span> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, don't print even error trace lines to screen</span>
-<span id="L187" class="LineNr">187 </span><span class="Normal">bool</span> <span class="Special">Hide_warnings</span> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, don't print warnings to screen</span>
-<span id="L188" class="LineNr">188 </span><span class="Normal">bool</span> <span class="Special"><a href='003trace.cc.html#L188'>Dump_trace</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, print trace lines to screen</span>
-<span id="L189" class="LineNr">189 </span>string <span class="Special"><a href='003trace.cc.html#L189'>Dump_label</a></span> = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// if set, print trace lines matching a single label to screen</span>
-<span id="L190" class="LineNr">190 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L191" class="LineNr">191 </span><span class="Special">Hide_errors</span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L192" class="LineNr">192 </span><span class="Special">Hide_warnings</span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L193" class="LineNr">193 </span><span class="Special"><a href='003trace.cc.html#L188'>Dump_trace</a></span> = <span class="Special"><a href='003trace.cc.html#L179'>Flag_dump_trace</a></span><span class="Delimiter">;</span>
-<span id="L194" class="LineNr">194 </span><span class="Special"><a href='003trace.cc.html#L189'>Dump_label</a></span> = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L195" class="LineNr">195 </span><span class="Comment">//: Never dump warnings in scenarios</span>
-<span id="L196" class="LineNr">196 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
-<span id="L197" class="LineNr">197 </span><span class="Special">Hide_warnings</span> =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L198" class="LineNr">198 </span>
-<span id="L199" class="LineNr">199 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L200" class="LineNr">200 </span><span class="Comment">#define CLEAR_TRACE  delete Trace_stream, Trace_stream = new trace_stream;</span>
-<span id="L201" class="LineNr">201 </span>
-<span id="L202" class="LineNr">202 </span><span class="Comment">// Top-level helper. IMPORTANT: can't nest</span>
-<span id="L203" class="LineNr">203 </span><span class="Comment">#define trace(...)  !Trace_stream ? cerr /*print nothing*/ : Trace_stream-&gt;stream(__VA_ARGS__)</span>
-<span id="L204" class="LineNr">204 </span>
-<span id="L205" class="LineNr">205 </span><span class="Comment">// Just for debugging; 'git log' should never show any calls to 'dbg'.</span>
-<span id="L206" class="LineNr">206 </span><span class="Comment">#define dbg trace(0, &quot;a&quot;)</span>
-<span id="L207" class="LineNr">207 </span><span class="Comment">#define DUMP(label)  if (Trace_stream) cerr &lt;&lt; Trace_stream-&gt;readable_contents(label);</span>
-<span id="L208" class="LineNr">208 </span>
-<span id="L209" class="LineNr">209 </span><span class="Comment">// Errors and warnings are special layers.</span>
-<span id="L210" class="LineNr">210 </span><span class="Comment">#define raise  (!Trace_stream ? (++Trace_errors,cerr) /*do print*/ : Trace_stream-&gt;stream(Error_depth, &quot;error&quot;))</span>
-<span id="L211" class="LineNr">211 </span><span class="Comment">#define warn (!Trace_stream ? (++Trace_errors,cerr) /*do print*/ : Trace_stream-&gt;stream(Warn_depth, &quot;warn&quot;))</span>
-<span id="L212" class="LineNr">212 </span><span class="Comment">// If we aren't yet sure how to deal with some corner case, use assert_for_now</span>
-<span id="L213" class="LineNr">213 </span><span class="Comment">// to indicate that it isn't an inviolable invariant.</span>
-<span id="L214" class="LineNr">214 </span><span class="Comment">#define assert_for_now assert</span>
-<span id="L215" class="LineNr">215 </span><span class="Comment">#define raise_for_now raise</span>
-<span id="L216" class="LineNr">216 </span>
-<span id="L217" class="LineNr">217 </span><span class="Comment">// Inside tests, fail any tests that displayed (unexpected) errors.</span>
-<span id="L218" class="LineNr">218 </span><span class="Comment">// Expected errors in tests should always be hidden and silently checked for.</span>
-<span id="L219" class="LineNr">219 </span><span class="Delimiter">:(before &quot;End Test Teardown&quot;)</span>
-<span id="L220" class="LineNr">220 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> &amp;&amp; !<span class="Special">Hide_errors</span> &amp;&amp; <a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L221" class="LineNr">221 </span>  <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L222" class="LineNr">222 </span><span class="Delimiter">}</span>
-<span id="L223" class="LineNr">223 </span><span class="Delimiter">:(code)</span>
-<span id="L224" class="LineNr">224 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L225" class="LineNr">225 </span>  <span class="Identifier">return</span> <span class="Special"><a href='003trace.cc.html#L175'>Trace_errors</a></span> &gt; <span class="Constant">0</span> || trace_count<span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">)</span> &gt; <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L185" class="LineNr">185 </span><span class="Comment">// Just for debugging; 'git log' should never show any calls to 'dbg'.</span>
+<span id="L186" class="LineNr">186 </span><span class="Comment">#define dbg trace(0, &quot;a&quot;)</span>
+<span id="L187" class="LineNr">187 </span><span class="Comment">#define DUMP(label)  if (Trace_stream) cerr &lt;&lt; Trace_stream-&gt;readable_contents(label);</span>
+<span id="L188" class="LineNr">188 </span>
+<span id="L189" class="LineNr">189 </span><span class="Comment">// Errors and warnings are special layers.</span>
+<span id="L190" class="LineNr">190 </span><span class="Comment">#define raise  (!Trace_stream ? (++Trace_errors,cerr) /*do print*/ : Trace_stream-&gt;stream(Error_depth, &quot;error&quot;))</span>
+<span id="L191" class="LineNr">191 </span><span class="Comment">#define warn (!Trace_stream ? (++Trace_errors,cerr) /*do print*/ : Trace_stream-&gt;stream(Warn_depth, &quot;warn&quot;))</span>
+<span id="L192" class="LineNr">192 </span><span class="Comment">// If we aren't yet sure how to deal with some corner case, use assert_for_now</span>
+<span id="L193" class="LineNr">193 </span><span class="Comment">// to indicate that it isn't an inviolable invariant.</span>
+<span id="L194" class="LineNr">194 </span><span class="Comment">#define assert_for_now assert</span>
+<span id="L195" class="LineNr">195 </span><span class="Comment">#define raise_for_now raise</span>
+<span id="L196" class="LineNr">196 </span>
+<span id="L197" class="LineNr">197 </span><span class="Comment">// Inside tests, fail any tests that displayed (unexpected) errors.</span>
+<span id="L198" class="LineNr">198 </span><span class="Comment">// Expected errors in tests should always be hidden and silently checked for.</span>
+<span id="L199" class="LineNr">199 </span><span class="Delimiter">:(before &quot;End Test Teardown&quot;)</span>
+<span id="L200" class="LineNr">200 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> &amp;&amp; !<span class="Special">Hide_errors</span> &amp;&amp; <a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L202" class="LineNr">202 </span><span class="Delimiter">}</span>
+<span id="L203" class="LineNr">203 </span><span class="Delimiter">:(code)</span>
+<span id="L204" class="LineNr">204 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Identifier">return</span> <span class="Special"><a href='003trace.cc.html#L155'>Trace_errors</a></span> &gt; <span class="Constant">0</span> || trace_count<span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">)</span> &gt; <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L206" class="LineNr">206 </span><span class="Delimiter">}</span>
+<span id="L207" class="LineNr">207 </span>
+<span id="L208" class="LineNr">208 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L209" class="LineNr">209 </span><span class="Normal">struct</span> end <span class="Delimiter">{};</span>
+<span id="L210" class="LineNr">210 </span><span class="Delimiter">:(code)</span>
+<span id="L211" class="LineNr">211 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> end <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L212" class="LineNr">212 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L127'>newline</a><span class="Delimiter">();</span>
+<span id="L213" class="LineNr">213 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
+<span id="L214" class="LineNr">214 </span><span class="Delimiter">}</span>
+<span id="L215" class="LineNr">215 </span>
+<span id="L216" class="LineNr">216 </span><span class="Comment">// Trace_stream is a resource, lease_tracer uses RAII to manage it.</span>
+<span id="L217" class="LineNr">217 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L218" class="LineNr">218 </span><span class="Normal">struct</span> lease_tracer <span class="Delimiter">{</span>
+<span id="L219" class="LineNr">219 </span>  lease_tracer<span class="Delimiter">();</span>
+<span id="L220" class="LineNr">220 </span>  <a href='003trace.cc.html#L224'>~lease_tracer</a><span class="Delimiter">();</span>
+<span id="L221" class="LineNr">221 </span><span class="Delimiter">};</span>
+<span id="L222" class="LineNr">222 </span><span class="Delimiter">:(code)</span>
+<span id="L223" class="LineNr">223 </span>lease_tracer::lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span> = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span>
+<span id="L224" class="LineNr">224 </span>lease_tracer::<a href='003trace.cc.html#L224'>~lease_tracer</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L225" class="LineNr">225 </span>  <span class="Normal">delete</span> <span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">,</span> <span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
 <span id="L226" class="LineNr">226 </span><span class="Delimiter">}</span>
-<span id="L227" class="LineNr">227 </span>
-<span id="L228" class="LineNr">228 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L229" class="LineNr">229 </span><span class="Normal">struct</span> end <span class="Delimiter">{};</span>
-<span id="L230" class="LineNr">230 </span><span class="Delimiter">:(code)</span>
-<span id="L231" class="LineNr">231 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> end <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L232" class="LineNr">232 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span>
-<span id="L233" class="LineNr">233 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
-<span id="L234" class="LineNr">234 </span><span class="Delimiter">}</span>
-<span id="L235" class="LineNr">235 </span>
-<span id="L236" class="LineNr">236 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L237" class="LineNr">237 </span><span class="Normal">bool</span> <span class="Special"><a href='003trace.cc.html#L237'>Save_trace</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, write out trace to disk</span>
-<span id="L238" class="LineNr">238 </span>
-<span id="L239" class="LineNr">239 </span><span class="Comment">// Trace_stream is a resource, lease_tracer uses RAII to manage it.</span>
-<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L241" class="LineNr">241 </span><span class="Normal">struct</span> lease_tracer <span class="Delimiter">{</span>
-<span id="L242" class="LineNr">242 </span>  lease_tracer<span class="Delimiter">();</span>
-<span id="L243" class="LineNr">243 </span>  <a href='003trace.cc.html#L247'>~lease_tracer</a><span class="Delimiter">();</span>
-<span id="L244" class="LineNr">244 </span><span class="Delimiter">};</span>
-<span id="L245" class="LineNr">245 </span><span class="Delimiter">:(code)</span>
-<span id="L246" class="LineNr">246 </span>lease_tracer::lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span> = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span>
-<span id="L247" class="LineNr">247 </span>lease_tracer::<a href='003trace.cc.html#L247'>~lease_tracer</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L248" class="LineNr">248 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L237'>Save_trace</a></span><span class="Delimiter">)</span> <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L133'>save</a><span class="Delimiter">();</span>
-<span id="L249" class="LineNr">249 </span>  <span class="Normal">delete</span> <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">,</span> <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L250" class="LineNr">250 </span><span class="Delimiter">}</span>
-<span id="L251" class="LineNr">251 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L252" class="LineNr">252 </span><span class="Comment">#define START_TRACING_UNTIL_END_OF_SCOPE  lease_tracer leased_tracer;</span>
-<span id="L253" class="LineNr">253 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
-<span id="L254" class="LineNr">254 </span><a href='003trace.cc.html#L252'>START_TRACING_UNTIL_END_OF_SCOPE</a>
-<span id="L255" class="LineNr">255 </span>
-<span id="L256" class="LineNr">256 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L257" class="LineNr">257 </span><span class="Comment">#define CHECK_TRACE_CONTENTS(...)  check_trace_contents(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)</span>
-<span id="L258" class="LineNr">258 </span>
-<span id="L259" class="LineNr">259 </span><span class="Comment">#define CHECK_TRACE_CONTAINS_ERRORS()  CHECK(trace_contains_errors())</span>
-<span id="L260" class="LineNr">260 </span><span class="Comment">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span>
-<span id="L261" class="LineNr">261 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> &amp;&amp; <a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> \
-<span id="L262" class="LineNr">262 </span>    cerr &lt;&lt; <span class="Constant">&quot;\nF - &quot;</span> &lt;&lt; __FUNCTION__ &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Constant">__FILE__</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; <span class="Constant">__LINE__</span> &lt;&lt; <span class="Constant">&quot;): unexpected errors\n&quot;</span><span class="Delimiter">;</span> \
-<span id="L263" class="LineNr">263 </span>    <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">);</span> \
-<span id="L264" class="LineNr">264 </span>    <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
-<span id="L265" class="LineNr">265 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span> \
-<span id="L266" class="LineNr">266 </span>  <span class="Delimiter">}</span>
-<span id="L267" class="LineNr">267 </span>
-<span id="L268" class="LineNr">268 </span><span class="Comment">#define CHECK_TRACE_COUNT(label, count) \</span>
-<span id="L269" class="LineNr">269 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> &amp;&amp; trace_count<span class="Delimiter">(</span>label<span class="Delimiter">)</span> != <span class="Delimiter">(</span>count<span class="Delimiter">))</span> <span class="Delimiter">{</span> \
-<span id="L270" class="LineNr">270 </span>    cerr &lt;&lt; <span class="Constant">&quot;\nF - &quot;</span> &lt;&lt; __FUNCTION__ &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Constant">__FILE__</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; <span class="Constant">__LINE__</span> &lt;&lt; <span class="Constant">&quot;): trace_count of &quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot; should be &quot;</span> &lt;&lt; count &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> \
-<span id="L271" class="LineNr">271 </span>    cerr &lt;&lt; <span class="Constant">&quot;  got &quot;</span> &lt;&lt; trace_count<span class="Delimiter">(</span>label<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>  <span class="Comment">/*</span><span class="Comment"> multiple eval </span><span class="Comment">*/</span> \
-<span id="L272" class="LineNr">272 </span>    <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span> \
-<span id="L273" class="LineNr">273 </span>    <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
-<span id="L274" class="LineNr">274 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</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="Comment">#define CHECK_TRACE_DOESNT_CONTAIN(...)  CHECK(trace_doesnt_contain(__VA_ARGS__))</span>
-<span id="L278" class="LineNr">278 </span>
-<span id="L279" class="LineNr">279 </span><span class="Delimiter">:(code)</span>
-<span id="L280" class="LineNr">280 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L280'>check_trace_contents</a><span class="Delimiter">(</span>string FUNCTION<span class="Delimiter">,</span> string <span class="Normal">FILE</span><span class="Delimiter">,</span> <span class="Normal">int</span> LINE<span class="Delimiter">,</span> string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L281" class="LineNr">281 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='002test.cc.html#L21'>Passed</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L282" class="LineNr">282 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L283" class="LineNr">283 </span>  vector&lt;string&gt; expected_lines = <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;^D&quot;</span><span class="Delimiter">);</span>
-<span id="L284" class="LineNr">284 </span>  <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L285" class="LineNr">285 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> &amp;&amp; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>empty<span class="Delimiter">())</span>
-<span id="L286" class="LineNr">286 </span>    ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L287" class="LineNr">287 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L288" class="LineNr">288 </span>  string label<span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">;</span>
-<span id="L289" class="LineNr">289 </span>  <a href='003trace.cc.html#L312'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &amp;label<span class="Delimiter">,</span> &amp;contents<span class="Delimiter">);</span>
-<span id="L290" class="LineNr">290 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L291" class="LineNr">291 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label != p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L292" class="LineNr">292 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> != <a href='003trace.cc.html#L398'>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 class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L293" class="LineNr">293 </span>    ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L294" class="LineNr">294 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> &amp;&amp; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>empty<span class="Delimiter">())</span>
-<span id="L295" class="LineNr">295 </span>      ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L296" class="LineNr">296 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L297" class="LineNr">297 </span>    <a href='003trace.cc.html#L312'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &amp;label<span class="Delimiter">,</span> &amp;contents<span class="Delimiter">);</span>
+<span id="L227" class="LineNr">227 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L228" class="LineNr">228 </span><span class="Comment">#define START_TRACING_UNTIL_END_OF_SCOPE  lease_tracer leased_tracer;</span>
+<span id="L229" class="LineNr">229 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
+<span id="L230" class="LineNr">230 </span><a href='003trace.cc.html#L228'>START_TRACING_UNTIL_END_OF_SCOPE</a>
+<span id="L231" class="LineNr">231 </span>
+<span id="L232" class="LineNr">232 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L233" class="LineNr">233 </span><span class="Comment">#define CHECK_TRACE_CONTENTS(...)  check_trace_contents(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)</span>
+<span id="L234" class="LineNr">234 </span>
+<span id="L235" class="LineNr">235 </span><span class="Comment">#define CHECK_TRACE_CONTAINS_ERRORS()  CHECK(trace_contains_errors())</span>
+<span id="L236" class="LineNr">236 </span><span class="Comment">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span>
+<span id="L237" class="LineNr">237 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> &amp;&amp; <a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> \
+<span id="L238" class="LineNr">238 </span>    cerr &lt;&lt; <span class="Constant">&quot;\nF - &quot;</span> &lt;&lt; __FUNCTION__ &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Constant">__FILE__</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; <span class="Constant">__LINE__</span> &lt;&lt; <span class="Constant">&quot;): unexpected errors\n&quot;</span><span class="Delimiter">;</span> \
+<span id="L239" class="LineNr">239 </span>    <a href='003trace.cc.html#L187'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">);</span> \
+<span id="L240" class="LineNr">240 </span>    <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
+<span id="L241" class="LineNr">241 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span> \
+<span id="L242" class="LineNr">242 </span>  <span class="Delimiter">}</span>
+<span id="L243" class="LineNr">243 </span>
+<span id="L244" class="LineNr">244 </span><span class="Comment">#define CHECK_TRACE_COUNT(label, count) \</span>
+<span id="L245" class="LineNr">245 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> &amp;&amp; trace_count<span class="Delimiter">(</span>label<span class="Delimiter">)</span> != <span class="Delimiter">(</span>count<span class="Delimiter">))</span> <span class="Delimiter">{</span> \
+<span id="L246" class="LineNr">246 </span>    cerr &lt;&lt; <span class="Constant">&quot;\nF - &quot;</span> &lt;&lt; __FUNCTION__ &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Constant">__FILE__</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; <span class="Constant">__LINE__</span> &lt;&lt; <span class="Constant">&quot;): trace_count of &quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot; should be &quot;</span> &lt;&lt; count &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> \
+<span id="L247" class="LineNr">247 </span>    cerr &lt;&lt; <span class="Constant">&quot;  got &quot;</span> &lt;&lt; trace_count<span class="Delimiter">(</span>label<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>  <span class="Comment">/*</span><span class="Comment"> multiple eval </span><span class="Comment">*/</span> \
+<span id="L248" class="LineNr">248 </span>    <a href='003trace.cc.html#L187'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span> \
+<span id="L249" class="LineNr">249 </span>    <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
+<span id="L250" class="LineNr">250 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span> \
+<span id="L251" class="LineNr">251 </span>  <span class="Delimiter">}</span>
+<span id="L252" class="LineNr">252 </span>
+<span id="L253" class="LineNr">253 </span><span class="Comment">#define CHECK_TRACE_DOESNT_CONTAIN(...)  CHECK(trace_doesnt_contain(__VA_ARGS__))</span>
+<span id="L254" class="LineNr">254 </span>
+<span id="L255" class="LineNr">255 </span><span class="Delimiter">:(code)</span>
+<span id="L256" class="LineNr">256 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L256'>check_trace_contents</a><span class="Delimiter">(</span>string FUNCTION<span class="Delimiter">,</span> string <span class="Normal">FILE</span><span class="Delimiter">,</span> <span class="Normal">int</span> LINE<span class="Delimiter">,</span> string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L257" class="LineNr">257 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='002test.cc.html#L21'>Passed</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L258" class="LineNr">258 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L259" class="LineNr">259 </span>  vector&lt;string&gt; expected_lines = <a href='003trace.cc.html#L350'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;^D&quot;</span><span class="Delimiter">);</span>
+<span id="L260" class="LineNr">260 </span>  <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L261" class="LineNr">261 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> &amp;&amp; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>empty<span class="Delimiter">())</span>
+<span id="L262" class="LineNr">262 </span>    ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L263" class="LineNr">263 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L264" class="LineNr">264 </span>  string label<span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">;</span>
+<span id="L265" class="LineNr">265 </span>  <a href='003trace.cc.html#L288'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &amp;label<span class="Delimiter">,</span> &amp;contents<span class="Delimiter">);</span>
+<span id="L266" class="LineNr">266 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L97'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L97'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L267" class="LineNr">267 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label != p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Identifier">continue</span><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#L74'>contents</a> != <a href='003trace.cc.html#L374'>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 class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L269" class="LineNr">269 </span>    ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L270" class="LineNr">270 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> &amp;&amp; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>empty<span class="Delimiter">())</span>
+<span id="L271" class="LineNr">271 </span>      ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L272" class="LineNr">272 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L273" class="LineNr">273 </span>    <a href='003trace.cc.html#L288'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &amp;label<span class="Delimiter">,</span> &amp;contents<span class="Delimiter">);</span>
+<span id="L274" class="LineNr">274 </span>  <span class="Delimiter">}</span>
+<span id="L275" class="LineNr">275 </span>
+<span id="L276" class="LineNr">276 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L301'>line_exists_anywhere</a><span class="Delimiter">(</span>label<span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L277" class="LineNr">277 </span>    cerr &lt;&lt; <span class="Constant">&quot;\nF - &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#L117'>line</a> [&quot;</span> &lt;&lt; label &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#L183'>trace</a>:\n&quot;</span><span class="Delimiter">;</span>
+<span id="L278" class="LineNr">278 </span>    <a href='003trace.cc.html#L187'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Delimiter">}</span>
+<span id="L280" class="LineNr">280 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L281" class="LineNr">281 </span>    cerr &lt;&lt; <span class="Constant">&quot;\nF - &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;): missing [&quot;</span> &lt;&lt; <a href='003trace.cc.html#L74'>contents</a> &lt;&lt; <span class="Constant">&quot;] in <a href='003trace.cc.html#L183'>trace</a>:\n&quot;</span><span class="Delimiter">;</span>
+<span id="L282" class="LineNr">282 </span>    <a href='003trace.cc.html#L187'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L283" class="LineNr">283 </span>  <span class="Delimiter">}</span>
+<span id="L284" class="LineNr">284 </span>  <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L285" class="LineNr">285 </span>  <span class="Identifier">return</span><span class="Constant"> false</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="Normal">void</span> <a href='003trace.cc.html#L288'>split_label_contents</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">,</span> string* label<span class="Delimiter">,</span> string* <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L289" class="LineNr">289 </span>  <span class="Normal">static</span> <span class="Normal">const</span> string delim<span class="Delimiter">(</span><span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
+<span id="L290" class="LineNr">290 </span>  <span class="Normal">size_t</span> pos = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L291" class="LineNr">291 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L292" class="LineNr">292 </span>    *label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L293" class="LineNr">293 </span>    *contents = <a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Delimiter">}</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L296" class="LineNr">296 </span>    *label = <a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> pos<span class="Delimiter">));</span>
+<span id="L297" class="LineNr">297 </span>    *contents = <a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span>pos+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">)));</span>
 <span id="L298" class="LineNr">298 </span>  <span class="Delimiter">}</span>
-<span id="L299" class="LineNr">299 </span>
-<span id="L300" class="LineNr">300 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L325'>line_exists_anywhere</a><span class="Delimiter">(</span>label<span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L301" class="LineNr">301 </span>    cerr &lt;&lt; <span class="Constant">&quot;\nF - &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#L117'>line</a> [&quot;</span> &lt;&lt; label &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#L203'>trace</a>:\n&quot;</span><span class="Delimiter">;</span>
-<span id="L302" class="LineNr">302 </span>    <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</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="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L305" class="LineNr">305 </span>    cerr &lt;&lt; <span class="Constant">&quot;\nF - &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;): missing [&quot;</span> &lt;&lt; <a href='003trace.cc.html#L74'>contents</a> &lt;&lt; <span class="Constant">&quot;] in <a href='003trace.cc.html#L203'>trace</a>:\n&quot;</span><span class="Delimiter">;</span>
-<span id="L306" class="LineNr">306 </span>    <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
-<span id="L307" class="LineNr">307 </span>  <span class="Delimiter">}</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Special"><a href='002test.cc.html#L21'>Passed</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L309" class="LineNr">309 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L310" class="LineNr">310 </span><span class="Delimiter">}</span>
-<span id="L311" class="LineNr">311 </span>
-<span id="L312" class="LineNr">312 </span><span class="Normal">void</span> <a href='003trace.cc.html#L312'>split_label_contents</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">,</span> string* label<span class="Delimiter">,</span> string* <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L313" class="LineNr">313 </span>  <span class="Normal">static</span> <span class="Normal">const</span> string delim<span class="Delimiter">(</span><span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
-<span id="L314" class="LineNr">314 </span>  <span class="Normal">size_t</span> pos = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L315" class="LineNr">315 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L316" class="LineNr">316 </span>    *label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L317" class="LineNr">317 </span>    *contents = <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">);</span>
-<span id="L318" class="LineNr">318 </span>  <span class="Delimiter">}</span>
-<span id="L319" class="LineNr">319 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L320" class="LineNr">320 </span>    *label = <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> pos<span class="Delimiter">));</span>
-<span id="L321" class="LineNr">321 </span>    *contents = <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span>pos+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">)));</span>
-<span id="L322" class="LineNr">322 </span>  <span class="Delimiter">}</span>
+<span id="L299" class="LineNr">299 </span><span class="Delimiter">}</span>
+<span id="L300" class="LineNr">300 </span>
+<span id="L301" class="LineNr">301 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L301'>line_exists_anywhere</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; label<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L302" class="LineNr">302 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L97'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L97'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L303" class="LineNr">303 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label != p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L304" class="LineNr">304 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> == <a href='003trace.cc.html#L374'>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 class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L305" class="LineNr">305 </span>  <span class="Delimiter">}</span>
+<span id="L306" class="LineNr">306 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L307" class="LineNr">307 </span><span class="Delimiter">}</span>
+<span id="L308" class="LineNr">308 </span>
+<span id="L309" class="LineNr">309 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L310" class="LineNr">310 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L311" class="LineNr">311 </span><span class="Delimiter">}</span>
+<span id="L312" class="LineNr">312 </span>
+<span id="L313" class="LineNr">313 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L314" class="LineNr">314 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L316" class="LineNr">316 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L97'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L97'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L317" class="LineNr">317 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L318" class="LineNr">318 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011run.cc.html#L117'>line</a> == <span class="Constant">&quot;&quot;</span> || <a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span><a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> == <a href='003trace.cc.html#L374'>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="L319" class="LineNr">319 </span>        ++result<span class="Delimiter">;</span>
+<span id="L320" class="LineNr">320 </span>    <span class="Delimiter">}</span>
+<span id="L321" class="LineNr">321 </span>  <span class="Delimiter">}</span>
+<span id="L322" class="LineNr">322 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L323" class="LineNr">323 </span><span class="Delimiter">}</span>
 <span id="L324" class="LineNr">324 </span>
-<span id="L325" class="LineNr">325 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L325'>line_exists_anywhere</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; label<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L326" class="LineNr">326 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L327" class="LineNr">327 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label != p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L328" class="LineNr">328 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> == <a href='003trace.cc.html#L398'>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 class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L329" class="LineNr">329 </span>  <span class="Delimiter">}</span>
-<span id="L330" class="LineNr">330 </span>  <span class="Identifier">return</span><span class="Constant"> false</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="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L334" class="LineNr">334 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L325" class="LineNr">325 </span><span class="Normal">int</span> <a href='003trace.cc.html#L325'>trace_count_prefix</a><span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string prefix<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L326" class="LineNr">326 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L327" class="LineNr">327 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L328" class="LineNr">328 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L97'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L97'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L329" class="LineNr">329 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L330" class="LineNr">330 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L102'>starts_with</a><span class="Delimiter">(</span><a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span>
+<span id="L331" class="LineNr">331 </span>        ++result<span class="Delimiter">;</span>
+<span id="L332" class="LineNr">332 </span>    <span class="Delimiter">}</span>
+<span id="L333" class="LineNr">333 </span>  <span class="Delimiter">}</span>
+<span id="L334" class="LineNr">334 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L335" class="LineNr">335 </span><span class="Delimiter">}</span>
 <span id="L336" class="LineNr">336 </span>
-<span id="L337" class="LineNr">337 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L338" class="LineNr">338 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L339" class="LineNr">339 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L340" class="LineNr">340 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L341" class="LineNr">341 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L342" class="LineNr">342 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011run.cc.html#L117'>line</a> == <span class="Constant">&quot;&quot;</span> || <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> == <a href='003trace.cc.html#L398'>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="L343" class="LineNr">343 </span>        ++result<span class="Delimiter">;</span>
-<span id="L344" class="LineNr">344 </span>    <span class="Delimiter">}</span>
-<span id="L345" class="LineNr">345 </span>  <span class="Delimiter">}</span>
-<span id="L346" class="LineNr">346 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L347" class="LineNr">347 </span><span class="Delimiter">}</span>
-<span id="L348" class="LineNr">348 </span>
-<span id="L349" class="LineNr">349 </span><span class="Normal">int</span> <a href='003trace.cc.html#L349'>trace_count_prefix</a><span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string prefix<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L350" class="LineNr">350 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L352" class="LineNr">352 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L353" class="LineNr">353 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>label == p<span class="Delimiter">-&gt;</span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L354" class="LineNr">354 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span>
-<span id="L355" class="LineNr">355 </span>        ++result<span class="Delimiter">;</span>
-<span id="L356" class="LineNr">356 </span>    <span class="Delimiter">}</span>
-<span id="L357" class="LineNr">357 </span>  <span class="Delimiter">}</span>
-<span id="L358" class="LineNr">358 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L359" class="LineNr">359 </span><span class="Delimiter">}</span>
-<span id="L360" class="LineNr">360 </span>
-<span id="L361" class="LineNr">361 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L362" class="LineNr">362 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L337" class="LineNr">337 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L338" class="LineNr">338 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L339" class="LineNr">339 </span><span class="Delimiter">}</span>
+<span id="L340" class="LineNr">340 </span>
+<span id="L341" class="LineNr">341 </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="L342" class="LineNr">342 </span>  vector&lt;string&gt; tmp = <a href='003trace.cc.html#L365'>split_first</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
+<span id="L343" class="LineNr">343 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>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="L344" class="LineNr">344 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; expected &lt;&lt; <span class="Constant">&quot;: missing label or <a href='003trace.cc.html#L74'>contents</a> in <a href='003trace.cc.html#L183'>trace</a> line\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L345" class="LineNr">345 </span>    assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
+<span id="L346" class="LineNr">346 </span>  <span class="Delimiter">}</span>
+<span id="L347" class="LineNr">347 </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>
+<span id="L348" class="LineNr">348 </span><span class="Delimiter">}</span>
+<span id="L349" class="LineNr">349 </span>
+<span id="L350" class="LineNr">350 </span>vector&lt;string&gt; <a href='003trace.cc.html#L350'>split</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L351" class="LineNr">351 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
+<span id="L352" class="LineNr">352 </span>  <span class="Normal">size_t</span> begin=<span class="Constant">0</span><span class="Delimiter">,</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L353" class="LineNr">353 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L354" class="LineNr">354 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>end == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L355" class="LineNr">355 </span>      result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> begin<span class="Delimiter">,</span> string::npos<span class="Delimiter">));</span>
+<span id="L356" class="LineNr">356 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L357" class="LineNr">357 </span>    <span class="Delimiter">}</span>
+<span id="L358" class="LineNr">358 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> begin<span class="Delimiter">,</span> end-begin<span class="Delimiter">));</span>
+<span id="L359" class="LineNr">359 </span>    begin = end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L360" class="LineNr">360 </span>    end = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">,</span> begin<span class="Delimiter">);</span>
+<span id="L361" class="LineNr">361 </span>  <span class="Delimiter">}</span>
+<span id="L362" class="LineNr">362 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L363" class="LineNr">363 </span><span class="Delimiter">}</span>
 <span id="L364" class="LineNr">364 </span>
-<span id="L365" class="LineNr">365 </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="L366" class="LineNr">366 </span>  vector&lt;string&gt; tmp = <a href='003trace.cc.html#L389'>split_first</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
-<span id="L367" class="LineNr">367 </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="L368" class="LineNr">368 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; expected &lt;&lt; <span class="Constant">&quot;: missing label or <a href='003trace.cc.html#L74'>contents</a> in <a href='003trace.cc.html#L203'>trace</a> line\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L369" class="LineNr">369 </span>    assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
-<span id="L370" class="LineNr">370 </span>  <span class="Delimiter">}</span>
-<span id="L371" class="LineNr">371 </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>
+<span id="L365" class="LineNr">365 </span>vector&lt;string&gt; <a href='003trace.cc.html#L365'>split_first</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L366" class="LineNr">366 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
+<span id="L367" class="LineNr">367 </span>  <span class="Normal">size_t</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L368" class="LineNr">368 </span>  result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> end<span class="Delimiter">));</span>
+<span id="L369" class="LineNr">369 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>end != string::npos<span class="Delimiter">)</span>
+<span id="L370" class="LineNr">370 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">),</span> string::npos<span class="Delimiter">));</span>
+<span id="L371" class="LineNr">371 </span>  <span class="Identifier">return</span> result<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>vector&lt;string&gt; <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L375" class="LineNr">375 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
-<span id="L376" class="LineNr">376 </span>  <span class="Normal">size_t</span> begin=<span class="Constant">0</span><span class="Delimiter">,</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L377" class="LineNr">377 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L378" class="LineNr">378 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>end == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L379" class="LineNr">379 </span>      result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> begin<span class="Delimiter">,</span> string::npos<span class="Delimiter">));</span>
-<span id="L380" class="LineNr">380 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L381" class="LineNr">381 </span>    <span class="Delimiter">}</span>
-<span id="L382" class="LineNr">382 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> begin<span class="Delimiter">,</span> end-begin<span class="Delimiter">));</span>
-<span id="L383" class="LineNr">383 </span>    begin = end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L384" class="LineNr">384 </span>    end = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">,</span> begin<span class="Delimiter">);</span>
-<span id="L385" class="LineNr">385 </span>  <span class="Delimiter">}</span>
-<span id="L386" class="LineNr">386 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L387" class="LineNr">387 </span><span class="Delimiter">}</span>
-<span id="L388" class="LineNr">388 </span>
-<span id="L389" class="LineNr">389 </span>vector&lt;string&gt; <a href='003trace.cc.html#L389'>split_first</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L390" class="LineNr">390 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
-<span id="L391" class="LineNr">391 </span>  <span class="Normal">size_t</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L392" class="LineNr">392 </span>  result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> end<span class="Delimiter">));</span>
-<span id="L393" class="LineNr">393 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>end != string::npos<span class="Delimiter">)</span>
-<span id="L394" class="LineNr">394 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">),</span> string::npos<span class="Delimiter">));</span>
-<span id="L395" class="LineNr">395 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L396" class="LineNr">396 </span><span class="Delimiter">}</span>
-<span id="L397" class="LineNr">397 </span>
-<span id="L398" class="LineNr">398 </span>string <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L399" class="LineNr">399 </span>  string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
-<span id="L400" class="LineNr">400 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>first != s<span class="Delimiter">.</span>end<span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*first<span class="Delimiter">))</span>
-<span id="L401" class="LineNr">401 </span>    ++first<span class="Delimiter">;</span>
-<span id="L402" class="LineNr">402 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>first == s<span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L403" class="LineNr">403 </span>
-<span id="L404" class="LineNr">404 </span>  string::const_iterator last = --s<span class="Delimiter">.</span>end<span class="Delimiter">();</span>
-<span id="L405" class="LineNr">405 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>last != s<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*last<span class="Delimiter">))</span>
-<span id="L406" class="LineNr">406 </span>    --last<span class="Delimiter">;</span>
-<span id="L407" class="LineNr">407 </span>  ++last<span class="Delimiter">;</span>
-<span id="L408" class="LineNr">408 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>first<span class="Delimiter">,</span> last<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="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L412" class="LineNr">412 </span><span class="Comment">#include &lt;vector&gt;</span>
-<span id="L413" class="LineNr">413 </span><span class="Normal">using</span> std::vector<span class="Delimiter">;</span>
-<span id="L414" class="LineNr">414 </span><span class="Comment">#include &lt;list&gt;</span>
-<span id="L415" class="LineNr">415 </span><span class="Normal">using</span> std::list<span class="Delimiter">;</span>
-<span id="L416" class="LineNr">416 </span><span class="Comment">#include &lt;set&gt;</span>
-<span id="L417" class="LineNr">417 </span><span class="Normal">using</span> std::set<span class="Delimiter">;</span>
-<span id="L418" class="LineNr">418 </span>
-<span id="L419" class="LineNr">419 </span><span class="Comment">#include &lt;sstream&gt;</span>
-<span id="L420" class="LineNr">420 </span><span class="Normal">using</span> std::istringstream<span class="Delimiter">;</span>
-<span id="L421" class="LineNr">421 </span><span class="Normal">using</span> std::ostringstream<span class="Delimiter">;</span>
-<span id="L422" class="LineNr">422 </span>
-<span id="L423" class="LineNr">423 </span><span class="Comment">#include &lt;fstream&gt;</span>
-<span id="L424" class="LineNr">424 </span><span class="Normal">using</span> std::ifstream<span class="Delimiter">;</span>
-<span id="L425" class="LineNr">425 </span><span class="Normal">using</span> std::ofstream<span class="Delimiter">;</span>
+<span id="L374" class="LineNr">374 </span>string <a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L375" class="LineNr">375 </span>  string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
+<span id="L376" class="LineNr">376 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>first != s<span class="Delimiter">.</span>end<span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*first<span class="Delimiter">))</span>
+<span id="L377" class="LineNr">377 </span>    ++first<span class="Delimiter">;</span>
+<span id="L378" class="LineNr">378 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>first == s<span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L379" class="LineNr">379 </span>
+<span id="L380" class="LineNr">380 </span>  string::const_iterator last = --s<span class="Delimiter">.</span>end<span class="Delimiter">();</span>
+<span id="L381" class="LineNr">381 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>last != s<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*last<span class="Delimiter">))</span>
+<span id="L382" class="LineNr">382 </span>    --last<span class="Delimiter">;</span>
+<span id="L383" class="LineNr">383 </span>  ++last<span class="Delimiter">;</span>
+<span id="L384" class="LineNr">384 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>first<span class="Delimiter">,</span> last<span class="Delimiter">);</span>
+<span id="L385" class="LineNr">385 </span><span class="Delimiter">}</span>
+<span id="L386" class="LineNr">386 </span>
+<span id="L387" class="LineNr">387 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L388" class="LineNr">388 </span><span class="Comment">#include &lt;vector&gt;</span>
+<span id="L389" class="LineNr">389 </span><span class="Normal">using</span> std::vector<span class="Delimiter">;</span>
+<span id="L390" class="LineNr">390 </span><span class="Comment">#include &lt;list&gt;</span>
+<span id="L391" class="LineNr">391 </span><span class="Normal">using</span> std::list<span class="Delimiter">;</span>
+<span id="L392" class="LineNr">392 </span><span class="Comment">#include &lt;set&gt;</span>
+<span id="L393" class="LineNr">393 </span><span class="Normal">using</span> std::set<span class="Delimiter">;</span>
+<span id="L394" class="LineNr">394 </span>
+<span id="L395" class="LineNr">395 </span><span class="Comment">#include &lt;sstream&gt;</span>
+<span id="L396" class="LineNr">396 </span><span class="Normal">using</span> std::istringstream<span class="Delimiter">;</span>
+<span id="L397" class="LineNr">397 </span><span class="Normal">using</span> std::ostringstream<span class="Delimiter">;</span>
+<span id="L398" class="LineNr">398 </span>
+<span id="L399" class="LineNr">399 </span><span class="Comment">#include &lt;fstream&gt;</span>
+<span id="L400" class="LineNr">400 </span><span class="Normal">using</span> std::ifstream<span class="Delimiter">;</span>
+<span id="L401" class="LineNr">401 </span><span class="Normal">using</span> std::ofstream<span class="Delimiter">;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/003trace.test.cc.html b/html/subx/003trace.test.cc.html
index caaace9f..7a608391 100644
--- a/html/subx/003trace.test.cc.html
+++ b/html/subx/003trace.test.cc.html
@@ -59,66 +59,66 @@ if ('onhashchange' in window) {
 <a href='https://github.com/akkartik/mu/blob/master/subx/003trace.test.cc'>https://github.com/akkartik/mu/blob/master/subx/003trace.test.cc</a>
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr">  1 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L1'>test_trace_check_compares</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L2" class="LineNr">  2 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L3" class="LineNr">  3 </span>  <a href='003trace.cc.html#L257'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L2" class="LineNr">  2 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L3" class="LineNr">  3 </span>  <a href='003trace.cc.html#L233'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer: foo&quot;</span><span class="Delimiter">);</span>
 <span id="L4" class="LineNr">  4 </span><span class="Delimiter">}</span>
 <span id="L5" class="LineNr">  5 </span>
 <span id="L6" class="LineNr">  6 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L6'>test_trace_check_ignores_other_layers</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L7" class="LineNr">  7 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L8" class="LineNr">  8 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L9" class="LineNr">  9 </span>  <a href='003trace.cc.html#L257'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
-<span id="L10" class="LineNr"> 10 </span>  <a href='003trace.cc.html#L277'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L7" class="LineNr">  7 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L8" class="LineNr">  8 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L9" class="LineNr">  9 </span>  <a href='003trace.cc.html#L233'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L10" class="LineNr"> 10 </span>  <a href='003trace.cc.html#L253'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2: foo&quot;</span><span class="Delimiter">);</span>
 <span id="L11" class="LineNr"> 11 </span><span class="Delimiter">}</span>
 <span id="L12" class="LineNr"> 12 </span>
 <span id="L13" class="LineNr"> 13 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L13'>test_trace_check_ignores_leading_whitespace</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L14" class="LineNr"> 14 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L14" class="LineNr"> 14 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L15" class="LineNr"> 15 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">too little whitespace</span><span class="Comment">*/</span><span class="Constant">&quot;foo&quot;</span><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L16" class="LineNr"> 16 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">too much whitespace</span><span class="Comment">*/</span><span class="Constant">&quot;  foo&quot;</span><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</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="Normal">void</span> <a href='003trace.test.cc.html#L19'>test_trace_check_ignores_other_lines</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L20" class="LineNr"> 20 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L257'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L20" class="LineNr"> 20 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L233'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
 <span id="L23" class="LineNr"> 23 </span><span class="Delimiter">}</span>
 <span id="L24" class="LineNr"> 24 </span>
 <span id="L25" class="LineNr"> 25 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L25'>test_trace_check_ignores_other_lines2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L26" class="LineNr"> 26 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L27" class="LineNr"> 27 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L28" class="LineNr"> 28 </span>  <a href='003trace.cc.html#L257'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: bar&quot;</span><span class="Delimiter">);</span>
+<span id="L26" class="LineNr"> 26 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L27" class="LineNr"> 27 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </span>  <a href='003trace.cc.html#L233'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: bar&quot;</span><span class="Delimiter">);</span>
 <span id="L29" class="LineNr"> 29 </span><span class="Delimiter">}</span>
 <span id="L30" class="LineNr"> 30 </span>
 <span id="L31" class="LineNr"> 31 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L31'>test_trace_ignores_trailing_whitespace</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L32" class="LineNr"> 32 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L33" class="LineNr"> 33 </span>  <a href='003trace.cc.html#L257'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L32" class="LineNr"> 32 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L33" class="LineNr"> 33 </span>  <a href='003trace.cc.html#L233'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
 <span id="L34" class="LineNr"> 34 </span><span class="Delimiter">}</span>
 <span id="L35" class="LineNr"> 35 </span>
 <span id="L36" class="LineNr"> 36 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L36'>test_trace_ignores_trailing_whitespace2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L37" class="LineNr"> 37 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo &quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L38" class="LineNr"> 38 </span>  <a href='003trace.cc.html#L257'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L37" class="LineNr"> 37 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo &quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L38" class="LineNr"> 38 </span>  <a href='003trace.cc.html#L233'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
 <span id="L39" class="LineNr"> 39 </span><span class="Delimiter">}</span>
 <span id="L40" class="LineNr"> 40 </span>
 <span id="L41" class="LineNr"> 41 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L41'>test_trace_orders_across_layers</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L42" class="LineNr"> 42 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L43" class="LineNr"> 43 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L44" class="LineNr"> 44 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;qux&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L45" class="LineNr"> 45 </span>  <a href='003trace.cc.html#L257'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo^Dtest layer 2: bar^Dtest layer 1: qux^D&quot;</span><span class="Delimiter">);</span>
+<span id="L42" class="LineNr"> 42 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L43" class="LineNr"> 43 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L44" class="LineNr"> 44 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;qux&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L45" class="LineNr"> 45 </span>  <a href='003trace.cc.html#L233'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo^Dtest layer 2: bar^Dtest layer 1: qux^D&quot;</span><span class="Delimiter">);</span>
 <span id="L46" class="LineNr"> 46 </span><span class="Delimiter">}</span>
 <span id="L47" class="LineNr"> 47 </span>
 <span id="L48" class="LineNr"> 48 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L48'>test_trace_supports_count</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L49" class="LineNr"> 49 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L50" class="LineNr"> 50 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L49" class="LineNr"> 49 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L50" class="LineNr"> 50 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L51" class="LineNr"> 51 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;foo&quot;</span><span class="Delimiter">),</span> <span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L52" class="LineNr"> 52 </span><span class="Delimiter">}</span>
 <span id="L53" class="LineNr"> 53 </span>
 <span id="L54" class="LineNr"> 54 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L54'>test_trace_supports_count2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L55" class="LineNr"> 55 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L56" class="LineNr"> 56 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L55" class="LineNr"> 55 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L56" class="LineNr"> 56 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L57" class="LineNr"> 57 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">),</span> <span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L58" class="LineNr"> 58 </span><span class="Delimiter">}</span>
 <span id="L59" class="LineNr"> 59 </span>
 <span id="L60" class="LineNr"> 60 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L60'>test_trace_count_ignores_trailing_whitespace</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L61" class="LineNr"> 61 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L61" class="LineNr"> 61 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L62" class="LineNr"> 62 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;foo&quot;</span><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L63" class="LineNr"> 63 </span><span class="Delimiter">}</span>
 <span id="L64" class="LineNr"> 64 </span>
@@ -135,26 +135,26 @@ if ('onhashchange' in window) {
 <span id="L75" class="LineNr"> 75 </span><span class="Comment">// can't check trace because trace methods call 'split'</span>
 <span id="L76" class="LineNr"> 76 </span>
 <span id="L77" class="LineNr"> 77 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L77'>test_split_returns_at_least_one_elem</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L78" class="LineNr"> 78 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
+<span id="L78" class="LineNr"> 78 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L350'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
 <span id="L79" class="LineNr"> 79 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L80" class="LineNr"> 80 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L81" class="LineNr"> 81 </span><span class="Delimiter">}</span>
 <span id="L82" class="LineNr"> 82 </span>
 <span id="L83" class="LineNr"> 83 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L83'>test_split_returns_entire_input_when_no_delim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L84" class="LineNr"> 84 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
+<span id="L84" class="LineNr"> 84 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L350'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
 <span id="L85" class="LineNr"> 85 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L86" class="LineNr"> 86 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;abc&quot;</span><span class="Delimiter">);</span>
 <span id="L87" class="LineNr"> 87 </span><span class="Delimiter">}</span>
 <span id="L88" class="LineNr"> 88 </span>
 <span id="L89" class="LineNr"> 89 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L89'>test_split_works</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L90" class="LineNr"> 90 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,def&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
+<span id="L90" class="LineNr"> 90 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L350'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,def&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
 <span id="L91" class="LineNr"> 91 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L92" class="LineNr"> 92 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;abc&quot;</span><span class="Delimiter">);</span>
 <span id="L93" class="LineNr"> 93 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">&quot;def&quot;</span><span class="Delimiter">);</span>
 <span id="L94" class="LineNr"> 94 </span><span class="Delimiter">}</span>
 <span id="L95" class="LineNr"> 95 </span>
 <span id="L96" class="LineNr"> 96 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L96'>test_split_works2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L97" class="LineNr"> 97 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,def,ghi&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
+<span id="L97" class="LineNr"> 97 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L350'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,def,ghi&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
 <span id="L98" class="LineNr"> 98 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">3</span><span class="Delimiter">);</span>
 <span id="L99" class="LineNr"> 99 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;abc&quot;</span><span class="Delimiter">);</span>
 <span id="L100" class="LineNr">100 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">&quot;def&quot;</span><span class="Delimiter">);</span>
@@ -162,7 +162,7 @@ if ('onhashchange' in window) {
 <span id="L102" class="LineNr">102 </span><span class="Delimiter">}</span>
 <span id="L103" class="LineNr">103 </span>
 <span id="L104" class="LineNr">104 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L104'>test_split_handles_multichar_delim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L105" class="LineNr">105 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,,def,,ghi&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,,&quot;</span><span class="Delimiter">);</span>
+<span id="L105" class="LineNr">105 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L350'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,,def,,ghi&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,,&quot;</span><span class="Delimiter">);</span>
 <span id="L106" class="LineNr">106 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">3</span><span class="Delimiter">);</span>
 <span id="L107" class="LineNr">107 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;abc&quot;</span><span class="Delimiter">);</span>
 <span id="L108" class="LineNr">108 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">&quot;def&quot;</span><span class="Delimiter">);</span>
@@ -170,19 +170,19 @@ if ('onhashchange' in window) {
 <span id="L110" class="LineNr">110 </span><span class="Delimiter">}</span>
 <span id="L111" class="LineNr">111 </span>
 <span id="L112" class="LineNr">112 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L112'>test_trim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L113" class="LineNr">113 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L114" class="LineNr">114 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L115" class="LineNr">115 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L116" class="LineNr">116 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L117" class="LineNr">117 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L118" class="LineNr">118 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L119" class="LineNr">119 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  ab&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
-<span id="L120" class="LineNr">120 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L121" class="LineNr">121 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L122" class="LineNr">122 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;ab  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
-<span id="L123" class="LineNr">123 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; a &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L124" class="LineNr">124 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  a  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L125" class="LineNr">125 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  ab  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
+<span id="L113" class="LineNr">113 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L114" class="LineNr">114 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L115" class="LineNr">115 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L117" class="LineNr">117 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L118" class="LineNr">118 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L119" class="LineNr">119 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  ab&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
+<span id="L120" class="LineNr">120 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L121" class="LineNr">121 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L122" class="LineNr">122 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;ab  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
+<span id="L123" class="LineNr">123 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; a &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L124" class="LineNr">124 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  a  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L125" class="LineNr">125 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L374'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  ab  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
 <span id="L126" class="LineNr">126 </span><span class="Delimiter">}</span>
 </pre>
 </body>
diff --git a/html/subx/010---vm.cc.html b/html/subx/010---vm.cc.html
index c95cb76b..4c5f114b 100644
--- a/html/subx/010---vm.cc.html
+++ b/html/subx/010---vm.cc.html
@@ -99,7 +99,7 @@ if ('onhashchange' in window) {
 <span id="L34" class="LineNr"> 34 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Contents&quot;)</span>
 <span id="L35" class="LineNr"> 35 </span>cerr &lt;&lt; <span class="Constant">&quot;  registers\n&quot;</span><span class="Delimiter">;</span>
 <span id="L36" class="LineNr"> 36 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Texts&quot;)</span>
-<span id="L37" class="LineNr"> 37 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;registers&quot;</span><span class="Delimiter">,</span>
+<span id="L37" class="LineNr"> 37 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;registers&quot;</span><span class="Delimiter">,</span>
 <span id="L38" class="LineNr"> 38 </span>  <span class="Constant">&quot;SubX currently supports eight 32-bit integer registers. From 0 to 7, they are:\n&quot;</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Constant">&quot;  <a href='010---vm.cc.html#L13'>EAX</a> <a href='010---vm.cc.html#L14'>ECX</a> <a href='010---vm.cc.html#L15'>EDX</a> <a href='010---vm.cc.html#L16'>EBX</a> <a href='010---vm.cc.html#L17'>ESP</a> <a href='010---vm.cc.html#L18'>EBP</a> <a href='010---vm.cc.html#L19'>ESI</a> EDI\n&quot;</span>
 <span id="L40" class="LineNr"> 40 </span>  <span class="Constant">&quot;ESP contains the top of the stack.\n&quot;</span>
@@ -157,7 +157,7 @@ if ('onhashchange' in window) {
 <span id="L92" class="LineNr"> 92 </span>  <span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be signed </span><span class="Comment">*/</span> \
 <span id="L93" class="LineNr"> 93 </span>  <span class="Normal">int64_t</span> tmp = arg1 op arg2<span class="Delimiter">;</span> \
 <span id="L94" class="LineNr"> 94 </span>  arg1 = arg1 op arg2<span class="Delimiter">;</span> \
-<span id="L95" class="LineNr"> 95 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end<span class="Delimiter">();</span> \
+<span id="L95" class="LineNr"> 95 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end<span class="Delimiter">();</span> \
 <span id="L96" class="LineNr"> 96 </span>  SF = <span class="Delimiter">(</span>arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span> \
 <span id="L97" class="LineNr"> 97 </span>  ZF = <span class="Delimiter">(</span>arg1 == <span class="Constant">0</span><span class="Delimiter">);</span> \
 <span id="L98" class="LineNr"> 98 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>arg1 != tmp<span class="Delimiter">);</span> \
@@ -168,7 +168,7 @@ if ('onhashchange' in window) {
 <span id="L103" class="LineNr">103 </span><span class="Comment">#define BINARY_BITWISE_OP(op, arg1, arg2) { \</span>
 <span id="L104" class="LineNr">104 </span>  <span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be unsigned </span><span class="Comment">*/</span> \
 <span id="L105" class="LineNr">105 </span>  arg1 = arg1 op arg2<span class="Delimiter">;</span> \
-<span id="L106" class="LineNr">106 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end<span class="Delimiter">();</span> \
+<span id="L106" class="LineNr">106 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end<span class="Delimiter">();</span> \
 <span id="L107" class="LineNr">107 </span>  SF = <span class="Delimiter">(</span>arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span> \
 <span id="L108" class="LineNr">108 </span>  ZF = <span class="Delimiter">(</span>arg1 == <span class="Constant">0</span><span class="Delimiter">);</span> \
 <span id="L109" class="LineNr">109 </span>  <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
@@ -225,7 +225,7 @@ if ('onhashchange' in window) {
 <span id="L160" class="LineNr">160 </span><span class="Delimiter">:(code)</span>
 <span id="L161" class="LineNr">161 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L161'>sanity_check</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> start<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> end<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L162" class="LineNr">162 </span>  <span class="Normal">bool</span> dup_found =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L163" class="LineNr">163 </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><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L163" class="LineNr">163 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L164" class="LineNr">164 </span>    <span class="Normal">const</span> vma&amp; curr = <span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L165" class="LineNr">165 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>start == start<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L166" class="LineNr">166 </span>      assert<span class="Delimiter">(</span>!dup_found<span class="Delimiter">);</span>
@@ -252,7 +252,7 @@ if ('onhashchange' in window) {
 <span id="L187" class="LineNr">187 </span>  <span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='010---vm.cc.html#L151'>grow_until</a><span class="Delimiter">(</span>new_end_address<span class="Delimiter">);</span>
 <span id="L188" class="LineNr">188 </span><span class="Delimiter">}</span>
 <span id="L189" class="LineNr">189 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L189'>grow_data_segment</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> new_end_address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L190" class="LineNr">190 </span>  assert<span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L190" class="LineNr">190 </span>  assert<span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L191" class="LineNr">191 </span>  <span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='010---vm.cc.html#L151'>grow_until</a><span class="Delimiter">(</span>new_end_address<span class="Delimiter">);</span>
 <span id="L192" class="LineNr">192 </span><span class="Delimiter">}</span>
 <span id="L193" class="LineNr">193 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
@@ -281,15 +281,15 @@ if ('onhashchange' in window) {
 <span id="L216" class="LineNr">216 </span>
 <span id="L217" class="LineNr">217 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span>* <a href='010---vm.cc.html#L217'>mem_addr_u8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L218" class="LineNr">218 </span>  <span class="Normal">uint8_t</span>* result = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L219" class="LineNr">219 </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><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L219" class="LineNr">219 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L220" class="LineNr">220 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='010---vm.cc.html#L128'>match</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L221" class="LineNr">221 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span>
-<span id="L222" class="LineNr">222 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two segments\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L222" class="LineNr">222 </span>        <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two segments\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L223" class="LineNr">223 </span>      result = &amp;<span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">(</span>addr<span class="Delimiter">);</span>
 <span id="L224" class="LineNr">224 </span>    <span class="Delimiter">}</span>
 <span id="L225" class="LineNr">225 </span>  <span class="Delimiter">}</span>
 <span id="L226" class="LineNr">226 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result == <span class="Constant">NULL</span><span class="Delimiter">)</span>
-<span id="L227" class="LineNr">227 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;Tried to access uninitialized memory at address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L227" class="LineNr">227 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;Tried to access uninitialized memory at address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L228" class="LineNr">228 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L229" class="LineNr">229 </span><span class="Delimiter">}</span>
 <span id="L230" class="LineNr">230 </span><span class="Normal">inline</span> <span class="Normal">int8_t</span>* <a href='010---vm.cc.html#L230'>mem_addr_i8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -297,16 +297,16 @@ if ('onhashchange' in window) {
 <span id="L232" class="LineNr">232 </span><span class="Delimiter">}</span>
 <span id="L233" class="LineNr">233 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span>* <a href='010---vm.cc.html#L233'>mem_addr_u32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L234" class="LineNr">234 </span>  <span class="Normal">uint32_t</span>* result = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L235" class="LineNr">235 </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><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L235" class="LineNr">235 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L236" class="LineNr">236 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='010---vm.cc.html#L131'>match32</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L237" class="LineNr">237 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span>
-<span id="L238" class="LineNr">238 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two segments\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L238" class="LineNr">238 </span>        <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two segments\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L239" class="LineNr">239 </span>      result = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>&amp;<span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">(</span>addr<span class="Delimiter">));</span>
 <span id="L240" class="LineNr">240 </span>    <span class="Delimiter">}</span>
 <span id="L241" class="LineNr">241 </span>  <span class="Delimiter">}</span>
 <span id="L242" class="LineNr">242 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result == <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L243" class="LineNr">243 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;Tried to access uninitialized memory at address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L244" class="LineNr">244 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;The entire 4-byte <a href='011run.cc.html#L123'>word</a> should be initialized and lie in a single segment.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L243" class="LineNr">243 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;Tried to access uninitialized memory at address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L244" class="LineNr">244 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;The entire 4-byte <a href='011run.cc.html#L123'>word</a> should be initialized and lie in a single segment.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L245" class="LineNr">245 </span>  <span class="Delimiter">}</span>
 <span id="L246" class="LineNr">246 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L247" class="LineNr">247 </span><span class="Delimiter">}</span>
@@ -344,10 +344,10 @@ if ('onhashchange' in window) {
 <span id="L279" class="LineNr">279 </span>
 <span id="L280" class="LineNr">280 </span><span class="Normal">inline</span> <span class="Normal">bool</span> <a href='010---vm.cc.html#L280'>already_allocated</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L281" class="LineNr">281 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L282" class="LineNr">282 </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><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L282" class="LineNr">282 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L283" class="LineNr">283 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='010---vm.cc.html#L128'>match</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L284" class="LineNr">284 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span>
-<span id="L285" class="LineNr">285 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two segments\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L285" class="LineNr">285 </span>        <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two segments\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L286" class="LineNr">286 </span>      result =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L287" class="LineNr">287 </span>    <span class="Delimiter">}</span>
 <span id="L288" class="LineNr">288 </span>  <span class="Delimiter">}</span>
@@ -361,9 +361,9 @@ if ('onhashchange' in window) {
 <span id="L296" class="LineNr">296 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L296'>run_one_instruction</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L297" class="LineNr">297 </span>  <span class="Normal">uint8_t</span> op=<span class="Constant">0</span><span class="Delimiter">,</span> op2=<span class="Constant">0</span><span class="Delimiter">,</span> op3=<span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L298" class="LineNr">298 </span>  <span class="Comment">// Run One Instruction</span>
-<span id="L299" class="LineNr">299 </span>  <a href='003trace.cc.html#L203'>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;inst: 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L299" class="LineNr">299 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;inst: 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L300" class="LineNr">300 </span>  op = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
-<span id="L301" class="LineNr">301 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L188'>Dump_trace</a></span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L301" class="LineNr">301 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L168'>Dump_trace</a></span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L302" class="LineNr">302 </span>    cerr &lt;&lt; <span class="Constant">&quot;opcode: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L412'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L303" class="LineNr">303 </span>    cerr &lt;&lt; <span class="Constant">&quot;registers at start: &quot;</span><span class="Delimiter">;</span>
 <span id="L304" class="LineNr">304 </span>    <a href='010---vm.cc.html#L368'>dump_registers</a><span class="Delimiter">();</span>
@@ -379,7 +379,7 @@ if ('onhashchange' in window) {
 <span id="L314" class="LineNr">314 </span>    <span class="Comment">// End Two-Byte Opcodes Starting With 0f</span>
 <span id="L315" class="LineNr">315 </span>    <span class="Normal">default</span>:
 <span id="L316" class="LineNr">316 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after 0f: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L412'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L317" class="LineNr">317 </span>      <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L317" class="LineNr">317 </span>      <a href='003trace.cc.html#L187'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L318" class="LineNr">318 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L319" class="LineNr">319 </span>    <span class="Delimiter">}</span>
 <span id="L320" class="LineNr">320 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -391,13 +391,13 @@ if ('onhashchange' in window) {
 <span id="L326" class="LineNr">326 </span>      <span class="Comment">// End Three-Byte Opcodes Starting With f2 0f</span>
 <span id="L327" class="LineNr">327 </span>      <span class="Normal">default</span>:
 <span id="L328" class="LineNr">328 </span>        cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f2 0f: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L412'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L329" class="LineNr">329 </span>        <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L329" class="LineNr">329 </span>        <a href='003trace.cc.html#L187'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L330" class="LineNr">330 </span>        exit<span class="Delimiter">(</span><span class="Constant">1</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="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L333" class="LineNr">333 </span>    <span class="Normal">default</span>:
 <span id="L334" class="LineNr">334 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f2: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L412'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L335" class="LineNr">335 </span>      <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L335" class="LineNr">335 </span>      <a href='003trace.cc.html#L187'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L336" class="LineNr">336 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L337" class="LineNr">337 </span>    <span class="Delimiter">}</span>
 <span id="L338" class="LineNr">338 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -409,19 +409,19 @@ if ('onhashchange' in window) {
 <span id="L344" class="LineNr">344 </span>      <span class="Comment">// End Three-Byte Opcodes Starting With f3 0f</span>
 <span id="L345" class="LineNr">345 </span>      <span class="Normal">default</span>:
 <span id="L346" class="LineNr">346 </span>        cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f3 0f: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L412'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L347" class="LineNr">347 </span>        <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L347" class="LineNr">347 </span>        <a href='003trace.cc.html#L187'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L348" class="LineNr">348 </span>        exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L349" class="LineNr">349 </span>      <span class="Delimiter">}</span>
 <span id="L350" class="LineNr">350 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L351" class="LineNr">351 </span>    <span class="Normal">default</span>:
 <span id="L352" class="LineNr">352 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f3: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L412'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L353" class="LineNr">353 </span>      <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L353" class="LineNr">353 </span>      <a href='003trace.cc.html#L187'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L354" class="LineNr">354 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L355" class="LineNr">355 </span>    <span class="Delimiter">}</span>
 <span id="L356" class="LineNr">356 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L357" class="LineNr">357 </span>  <span class="Normal">default</span>:
 <span id="L358" class="LineNr">358 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized opcode: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L412'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L359" class="LineNr">359 </span>    <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L359" class="LineNr">359 </span>    <a href='003trace.cc.html#L187'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L360" class="LineNr">360 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L361" class="LineNr">361 </span>  <span class="Delimiter">}</span>
 <span id="L362" class="LineNr">362 </span><span class="Delimiter">}</span>
@@ -448,7 +448,7 @@ if ('onhashchange' in window) {
 <span id="L383" class="LineNr">383 </span><a href='010---vm.cc.html#L385'>init_op_names</a><span class="Delimiter">();</span>
 <span id="L384" class="LineNr">384 </span><span class="Delimiter">:(code)</span>
 <span id="L385" class="LineNr">385 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L385'>init_op_names</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L386" class="LineNr">386 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f4&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;halt (hlt)&quot;</span><span class="Delimiter">);</span>
+<span id="L386" class="LineNr">386 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f4&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;halt (hlt)&quot;</span><span class="Delimiter">);</span>
 <span id="L387" class="LineNr">387 </span>  <span class="Comment">// End Initialize Op Names</span>
 <span id="L388" class="LineNr">388 </span><span class="Delimiter">}</span>
 <span id="L389" class="LineNr">389 </span>
diff --git a/html/subx/011run.cc.html b/html/subx/011run.cc.html
index 99ff7ec9..2155c2cf 100644
--- a/html/subx/011run.cc.html
+++ b/html/subx/011run.cc.html
@@ -70,7 +70,7 @@ if ('onhashchange' in window) {
 <span id="L4" class="LineNr">  4 </span><span class="Comment">//: the VM. That comes later.)</span>
 <span id="L5" class="LineNr">  5 </span>
 <span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Texts&quot;)</span>
-<span id="L7" class="LineNr">  7 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;syntax&quot;</span><span class="Delimiter">,</span>
+<span id="L7" class="LineNr">  7 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;syntax&quot;</span><span class="Delimiter">,</span>
 <span id="L8" class="LineNr">  8 </span>  <span class="Constant">&quot;SubX programs consist of <a href='011run.cc.html#L100'>segments</a>, each segment in turn consisting of lines.\n&quot;</span>
 <span id="L9" class="LineNr">  9 </span>  <span class="Constant">&quot;Line-endings are significant; each <a href='011run.cc.html#L117'>line</a> should contain a single\n&quot;</span>
 <span id="L10" class="LineNr"> 10 </span>  <span class="Constant">&quot;instruction, macro or directive.\n&quot;</span>
@@ -90,7 +90,7 @@ if ('onhashchange' in window) {
 <span id="L24" class="LineNr"> 24 </span>  <span class="Constant">&quot;Segments with the same name get merged together. This rule helps keep functions and\n&quot;</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Constant">&quot;their data close together in .subx files.\n&quot;</span>
 <span id="L26" class="LineNr"> 26 </span>  <span class="Constant">&quot;Later <a href='011run.cc.html#L100'>segments</a> with the same name get their <a href='003trace.cc.html#L74'>contents</a> *prepended* to earlier ones.\n&quot;</span>
-<span id="L27" class="LineNr"> 27 </span>  <span class="Constant">&quot;This rule helps each .subx file to <a href='001help.cc.html#L243'>put</a> forth a different entrypoint for the binary,\n&quot;</span>
+<span id="L27" class="LineNr"> 27 </span>  <span class="Constant">&quot;This rule helps each .subx file to <a href='001help.cc.html#L252'>put</a> forth a different entrypoint for the binary,\n&quot;</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Constant">&quot;overriding previously loaded files.\n&quot;</span>
 <span id="L29" class="LineNr"> 29 </span>  <span class="Constant">&quot;\n&quot;</span>
 <span id="L30" class="LineNr"> 30 </span>  <span class="Constant">&quot;Lines consist of a series of words. Words can contain arbitrary metadata\n&quot;</span>
@@ -150,11 +150,11 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr"> 84 </span>  <a href='011run.cc.html#L99'>program</a> p<span class="Delimiter">;</span>
 <span id="L85" class="LineNr"> 85 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
 <span id="L86" class="LineNr"> 86 </span>  parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L87" class="LineNr"> 87 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// if any stage raises errors, stop immediately</span>
+<span id="L87" class="LineNr"> 87 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// if any stage raises errors, stop immediately</span>
 <span id="L88" class="LineNr"> 88 </span>  <a href='011run.cc.html#L231'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L89" class="LineNr"> 89 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L89" class="LineNr"> 89 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L90" class="LineNr"> 90 </span>  <a href='011run.cc.html#L240'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L91" class="LineNr"> 91 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L91" class="LineNr"> 91 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a> &lt; <span class="Special"><a href='010---vm.cc.html#L194'>End_of_program</a></span><span class="Delimiter">)</span>
 <span id="L93" class="LineNr"> 93 </span>    <a href='010---vm.cc.html#L296'>run_one_instruction</a><span class="Delimiter">();</span>
 <span id="L94" class="LineNr"> 94 </span><span class="Delimiter">}</span>
@@ -197,16 +197,16 @@ if ('onhashchange' in window) {
 <span id="L131" class="LineNr">131 </span><span class="Delimiter">:(code)</span>
 <span id="L132" class="LineNr">132 </span><span class="Normal">void</span> parse<span class="Delimiter">(</span>istream&amp; fin<span class="Delimiter">,</span> program&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L133" class="LineNr">133 </span>  vector&lt;line&gt; l<span class="Delimiter">;</span>
-<span id="L134" class="LineNr">134 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L135" class="LineNr">135 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L134" class="LineNr">134 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L136" class="LineNr">136 </span>    string line_data<span class="Delimiter">;</span>
 <span id="L137" class="LineNr">137 </span>    <a href='011run.cc.html#L117'>line</a> curr<span class="Delimiter">;</span>
 <span id="L138" class="LineNr">138 </span>    getline<span class="Delimiter">(</span>fin<span class="Delimiter">,</span> line_data<span class="Delimiter">);</span>
 <span id="L139" class="LineNr">139 </span>    curr<span class="Delimiter">.</span>original = line_data<span class="Delimiter">;</span>
-<span id="L140" class="LineNr">140 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;line: &quot;</span> &lt;&lt; line_data &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L140" class="LineNr">140 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;line: &quot;</span> &lt;&lt; line_data &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L141" class="LineNr">141 </span>    <span class="Comment">// End Line Parsing Special-cases(line_data -&gt; l)</span>
 <span id="L142" class="LineNr">142 </span>    istringstream lin<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span>
-<span id="L143" class="LineNr">143 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>lin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L143" class="LineNr">143 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>lin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L144" class="LineNr">144 </span>      string word_data<span class="Delimiter">;</span>
 <span id="L145" class="LineNr">145 </span>      lin &gt;&gt; word_data<span class="Delimiter">;</span>
 <span id="L146" class="LineNr">146 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
@@ -216,12 +216,12 @@ if ('onhashchange' in window) {
 <span id="L150" class="LineNr">150 </span>        <a href='011run.cc.html#L180'>flush</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> l<span class="Delimiter">);</span>
 <span id="L151" class="LineNr">151 </span>        string segment_title<span class="Delimiter">;</span>
 <span id="L152" class="LineNr">152 </span>        lin &gt;&gt; segment_title<span class="Delimiter">;</span>
-<span id="L153" class="LineNr">153 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span>segment_title<span class="Delimiter">,</span> <span class="Constant">&quot;0x&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><a href='001help.cc.html#L102'>starts_with</a><span class="Delimiter">(</span>segment_title<span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L154" class="LineNr">154 </span>          segment s<span class="Delimiter">;</span>
 <span id="L155" class="LineNr">155 </span>          s<span class="Delimiter">.</span>start = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>segment_title<span class="Delimiter">);</span>
 <span id="L156" class="LineNr">156 </span>          <a href='011run.cc.html#L201'>sanity_check_program_segment</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> s<span class="Delimiter">.</span>start<span class="Delimiter">);</span>
-<span id="L157" class="LineNr">157 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L158" class="LineNr">158 </span>          <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new segment from 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; s<span class="Delimiter">.</span>start &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L157" class="LineNr">157 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L158" class="LineNr">158 </span>          <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new segment from 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; s<span class="Delimiter">.</span>start &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L159" class="LineNr">159 </span>          out<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
 <span id="L160" class="LineNr">160 </span>        <span class="Delimiter">}</span>
 <span id="L161" class="LineNr">161 </span>        <span class="Comment">// End Segment Parsing Special-cases(segment_title)</span>
@@ -234,23 +234,23 @@ if ('onhashchange' in window) {
 <span id="L168" class="LineNr">168 </span>      <span class="Delimiter">}</span>
 <span id="L169" class="LineNr">169 </span>      curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span>
 <span id="L170" class="LineNr">170 </span>      <a href='011run.cc.html#L191'>parse_word</a><span class="Delimiter">(</span>word_data<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span>
-<span id="L171" class="LineNr">171 </span>      <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;word: &quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span>
+<span id="L171" class="LineNr">171 </span>      <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;word: &quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span>
 <span id="L172" class="LineNr">172 </span>    <span class="Delimiter">}</span>
 <span id="L173" class="LineNr">173 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
 <span id="L174" class="LineNr">174 </span>      l<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
 <span id="L175" class="LineNr">175 </span>  <span class="Delimiter">}</span>
 <span id="L176" class="LineNr">176 </span>  <a href='011run.cc.html#L180'>flush</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> l<span class="Delimiter">);</span>
-<span id="L177" class="LineNr">177 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L177" class="LineNr">177 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L178" class="LineNr">178 </span><span class="Delimiter">}</span>
 <span id="L179" class="LineNr">179 </span>
 <span id="L180" class="LineNr">180 </span><span class="Normal">void</span> <a href='011run.cc.html#L180'>flush</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">,</span> vector&lt;line&gt;&amp; <a href='011run.cc.html#L109'>lines</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L181" class="LineNr">181 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L182" class="LineNr">182 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L183" class="LineNr">183 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;input does not start with a '==' section header\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L183" class="LineNr">183 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;input does not start with a '==' section header\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L184" class="LineNr">184 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L185" class="LineNr">185 </span>  <span class="Delimiter">}</span>
 <span id="L186" class="LineNr">186 </span>  <span class="Comment">// End flush(p, lines) Special-cases</span>
-<span id="L187" class="LineNr">187 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;flushing to segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L187" class="LineNr">187 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;flushing to segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L188" class="LineNr">188 </span>  p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>
 <span id="L189" class="LineNr">189 </span><span class="Delimiter">}</span>
 <span id="L190" class="LineNr">190 </span>
@@ -265,9 +265,9 @@ if ('onhashchange' in window) {
 <span id="L199" class="LineNr">199 </span><span class="Delimiter">}</span>
 <span id="L200" class="LineNr">200 </span>
 <span id="L201" class="LineNr">201 </span><span class="Normal">void</span> <a href='011run.cc.html#L201'>sanity_check_program_segment</a><span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L202" class="LineNr">202 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L202" class="LineNr">202 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L203" class="LineNr">203 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>start == addr<span class="Delimiter">)</span>
-<span id="L204" class="LineNr">204 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;can't have multiple segments starting at address 0x&quot;</span> &lt;&lt; HEXWORD &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L204" class="LineNr">204 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;can't have multiple segments starting at address 0x&quot;</span> &lt;&lt; HEXWORD &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L205" class="LineNr">205 </span>  <span class="Delimiter">}</span>
 <span id="L206" class="LineNr">206 </span><span class="Delimiter">}</span>
 <span id="L207" class="LineNr">207 </span>
@@ -295,45 +295,45 @@ if ('onhashchange' in window) {
 <span id="L229" class="LineNr">229 </span>vector&lt;transform_fn&gt; <span class="Special"><a href='011run.cc.html#L229'>Transform</a></span><span class="Delimiter">;</span>
 <span id="L230" class="LineNr">230 </span>
 <span id="L231" class="LineNr">231 </span><span class="Normal">void</span> <a href='011run.cc.html#L231'>transform</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L232" class="LineNr">232 </span>  <a href='003trace.cc.html#L203'>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;begin&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L233" class="LineNr">233 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> t = <span class="Constant">0</span><span class="Delimiter">;</span>  t &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><span class="Special"><a href='011run.cc.html#L229'>Transform</a></span><span class="Delimiter">);</span>  ++t<span class="Delimiter">)</span>
+<span id="L232" class="LineNr">232 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L233" class="LineNr">233 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> t = <span class="Constant">0</span><span class="Delimiter">;</span>  t &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><span class="Special"><a href='011run.cc.html#L229'>Transform</a></span><span class="Delimiter">);</span>  ++t<span class="Delimiter">)</span>
 <span id="L234" class="LineNr">234 </span>    <span class="Delimiter">(</span>*<span class="Special"><a href='011run.cc.html#L229'>Transform</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>t<span class="Delimiter">))(</span>p<span class="Delimiter">);</span>
-<span id="L235" class="LineNr">235 </span>  <a href='003trace.cc.html#L203'>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;done&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L235" class="LineNr">235 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; end<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="SalientComment">//:: load</span>
 <span id="L239" class="LineNr">239 </span>
 <span id="L240" class="LineNr">240 </span><span class="Normal">void</span> <a href='011run.cc.html#L240'>load</a><span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L241" class="LineNr">241 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L241" class="LineNr">241 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L242" class="LineNr">242 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L243" class="LineNr">243 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;no <a href='031check_operands.cc.html#L11'>code</a> to run\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L243" class="LineNr">243 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;no <a href='031check_operands.cc.html#L11'>code</a> to run\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L244" class="LineNr">244 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L245" class="LineNr">245 </span>  <span class="Delimiter">}</span>
 <span id="L246" class="LineNr">246 </span>  <span class="Comment">// Ensure segments are disjoint.</span>
 <span id="L247" class="LineNr">247 </span>  set&lt;<span class="Normal">uint32_t</span>&gt; overlap<span class="Delimiter">;</span>
-<span id="L248" class="LineNr">248 </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>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L248" class="LineNr">248 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>   i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L249" class="LineNr">249 </span>    <span class="Normal">const</span> segment&amp; seg = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L250" class="LineNr">250 </span>    <span class="Normal">uint32_t</span> addr = seg<span class="Delimiter">.</span>start<span class="Delimiter">;</span>
 <span id="L251" class="LineNr">251 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!already_allocated<span class="Delimiter">(</span>addr<span class="Delimiter">))</span>
 <span id="L252" class="LineNr">252 </span>      <span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span>seg<span class="Delimiter">.</span>start<span class="Delimiter">));</span>
-<span id="L253" class="LineNr">253 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;loading segment &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; from &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L254" class="LineNr">254 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>seg<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L253" class="LineNr">253 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;loading segment &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; from &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L254" class="LineNr">254 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>seg<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L255" class="LineNr">255 </span>      <span class="Normal">const</span> line&amp; l = seg<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L256" class="LineNr">256 </span>      <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> k = <span class="Constant">0</span><span class="Delimiter">;</span>  k &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++k<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L256" class="LineNr">256 </span>      <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> k = <span class="Constant">0</span><span class="Delimiter">;</span>  k &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++k<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L257" class="LineNr">257 </span>        <span class="Normal">const</span> word&amp; w = l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>k<span class="Delimiter">);</span>
 <span id="L258" class="LineNr">258 </span>        <span class="Normal">uint8_t</span> val = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L259" class="LineNr">259 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L259" class="LineNr">259 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L260" class="LineNr">260 </span>        assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span>addr<span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
 <span id="L261" class="LineNr">261 </span>        <a href='010---vm.cc.html#L263'>write_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
 <span id="L262" class="LineNr">262 </span>        overlap<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>addr<span class="Delimiter">);</span>
-<span id="L263" class="LineNr">263 </span>        <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L412'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L202'>read_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L263" class="LineNr">263 </span>        <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L412'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L202'>read_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L264" class="LineNr">264 </span>        ++addr<span class="Delimiter">;</span>
 <span id="L265" class="LineNr">265 </span>      <span class="Delimiter">}</span>
 <span id="L266" class="LineNr">266 </span>    <span class="Delimiter">}</span>
 <span id="L267" class="LineNr">267 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Special"><a href='010---vm.cc.html#L194'>End_of_program</a></span> = addr<span class="Delimiter">;</span>
 <span id="L268" class="LineNr">268 </span>  <span class="Delimiter">}</span>
 <span id="L269" class="LineNr">269 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>start<span class="Delimiter">;</span>
-<span id="L270" class="LineNr">270 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L270" class="LineNr">270 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; end<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">uint8_t</span> <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -341,11 +341,11 @@ if ('onhashchange' in window) {
 <span id="L275" class="LineNr">275 </span>  <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L276" class="LineNr">276 </span>  in &gt;&gt; std::hex &gt;&gt; result<span class="Delimiter">;</span>
 <span id="L277" class="LineNr">277 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!in || !in<span class="Delimiter">.</span>eof<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L278" class="LineNr">278 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;token '&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is not a hex byte\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L278" class="LineNr">278 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;token '&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is not a hex byte\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L279" class="LineNr">279 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
 <span id="L280" class="LineNr">280 </span>  <span class="Delimiter">}</span>
 <span id="L281" class="LineNr">281 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result &gt; <span class="Constant">0xff</span> || result &lt; -<span class="Constant">0x8f</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L282" class="LineNr">282 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;token '&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is not a hex byte\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L282" class="LineNr">282 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;token '&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is not a hex byte\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L283" class="LineNr">283 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</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="Normal">static_cast</span>&lt;<span class="Normal">uint8_t</span>&gt;<span class="Delimiter">(</span>result<span class="Delimiter">);</span>
@@ -386,20 +386,20 @@ if ('onhashchange' in window) {
 <span id="L320" class="LineNr">320 </span>  <a href='011run.cc.html#L99'>program</a> p<span class="Delimiter">;</span>
 <span id="L321" class="LineNr">321 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
 <span id="L322" class="LineNr">322 </span>  parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L323" class="LineNr">323 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// if any stage raises errors, stop immediately</span>
+<span id="L323" class="LineNr">323 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// if any stage raises errors, stop immediately</span>
 <span id="L324" class="LineNr">324 </span>  <a href='011run.cc.html#L240'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
 <span id="L325" class="LineNr">325 </span><span class="Delimiter">}</span>
 <span id="L326" class="LineNr">326 </span>
 <span id="L327" class="LineNr">327 </span><span class="SalientComment">//:: run</span>
 <span id="L328" class="LineNr">328 </span>
 <span id="L329" class="LineNr">329 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L330" class="LineNr">330 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add imm32 to <a href='010---vm.cc.html#L13'>EAX</a> (add)&quot;</span><span class="Delimiter">);</span>
+<span id="L330" class="LineNr">330 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add imm32 to <a href='010---vm.cc.html#L13'>EAX</a> (add)&quot;</span><span class="Delimiter">);</span>
 <span id="L331" class="LineNr">331 </span>
 <span id="L332" class="LineNr">332 </span><span class="Comment">//: our first opcode</span>
 <span id="L333" class="LineNr">333 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L334" class="LineNr">334 </span><span class="Normal">case</span> <span class="Constant">0x05</span>: <span class="Delimiter">{</span>  <span class="Comment">// add imm32 to EAX</span>
 <span id="L335" class="LineNr">335 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L336" class="LineNr">336 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to <a href='010---vm.cc.html#L23'>reg</a> EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L336" class="LineNr">336 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to <a href='010---vm.cc.html#L23'>reg</a> EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L337" class="LineNr">337 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L338" class="LineNr">338 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L339" class="LineNr">339 </span><span class="Delimiter">}</span>
@@ -420,7 +420,7 @@ if ('onhashchange' in window) {
 <span id="L354" class="LineNr">354 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L355" class="LineNr">355 </span>  ostringstream out<span class="Delimiter">;</span>
 <span id="L356" class="LineNr">356 </span>  out &lt;&lt; w<span class="Delimiter">.</span>data<span class="Delimiter">;</span>
-<span id="L357" class="LineNr">357 </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 id="L357" class="LineNr">357 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L358" class="LineNr">358 </span>    out &lt;&lt; <span class="Constant">&quot; /&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L359" class="LineNr">359 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L360" class="LineNr">360 </span><span class="Delimiter">}</span>
@@ -433,7 +433,7 @@ if ('onhashchange' in window) {
 <span id="L367" class="LineNr">367 </span>    <span class="Normal">int32_t</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L368" class="LineNr">368 </span>    in &gt;&gt; result<span class="Delimiter">;</span>
 <span id="L369" class="LineNr">369 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!in || !in<span class="Delimiter">.</span>eof<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L370" class="LineNr">370 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;not a number: &quot;</span> &lt;&lt; s &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L370" class="LineNr">370 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;not a number: &quot;</span> &lt;&lt; s &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L371" class="LineNr">371 </span>      <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L372" class="LineNr">372 </span>    <span class="Delimiter">}</span>
 <span id="L373" class="LineNr">373 </span>    <span class="Identifier">return</span> result<span class="Delimiter">;</span>
@@ -441,7 +441,7 @@ if ('onhashchange' in window) {
 <span id="L375" class="LineNr">375 </span>  <span class="Normal">uint32_t</span> uresult = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L376" class="LineNr">376 </span>  in &gt;&gt; uresult<span class="Delimiter">;</span>
 <span id="L377" class="LineNr">377 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!in || !in<span class="Delimiter">.</span>eof<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L378" class="LineNr">378 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;not a number: &quot;</span> &lt;&lt; s &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L378" class="LineNr">378 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;not a number: &quot;</span> &lt;&lt; s &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L379" class="LineNr">379 </span>    <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L380" class="LineNr">380 </span>  <span class="Delimiter">}</span>
 <span id="L381" class="LineNr">381 </span>  <span class="Identifier">return</span> <span class="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span>uresult<span class="Delimiter">);</span>
diff --git a/html/subx/012elf.cc.html b/html/subx/012elf.cc.html
index 88b0ffac..c2afb4f4 100644
--- a/html/subx/012elf.cc.html
+++ b/html/subx/012elf.cc.html
@@ -61,34 +61,34 @@ if ('onhashchange' in window) {
 <body onload='JumpToLine();'>
 <a href='https://github.com/akkartik/mu/blob/master/subx/012elf.cc'>https://github.com/akkartik/mu/blob/master/subx/012elf.cc</a>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="Comment">//: Generating ELF binaries for SubX programs.</span>
+<span id="L1" class="LineNr">  1 </span><span class="Comment">//: Loading SubX programs from ELF binaries.</span>
 <span id="L2" class="LineNr">  2 </span><span class="Comment">//: This will allow us to run them natively on a Linux kernel.</span>
 <span id="L3" class="LineNr">  3 </span><span class="Comment">//: Based on <a href="https://github.com/kragen/stoneknifeforth/blob/702d2ebe1b/386.c">https://github.com/kragen/stoneknifeforth/blob/702d2ebe1b/386.c</a></span>
 <span id="L4" class="LineNr">  4 </span>
 <span id="L5" class="LineNr">  5 </span><span class="Delimiter">:(before &quot;End Main&quot;)</span>
 <span id="L6" class="LineNr">  6 </span>assert<span class="Delimiter">(</span>argc &gt; <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L7" class="LineNr">  7 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L8" class="LineNr">  8 </span>  <a href='003trace.cc.html#L252'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span>
+<span id="L7" class="LineNr">  7 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L8" class="LineNr">  8 </span>  <a href='003trace.cc.html#L228'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span>
 <span id="L9" class="LineNr">  9 </span>  assert<span class="Delimiter">(</span>argc &gt; <span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L10" class="LineNr"> 10 </span>  <a href='000organization.cc.html#L148'>reset</a><span class="Delimiter">();</span>
 <span id="L11" class="LineNr"> 11 </span>  cerr &lt;&lt; std::hex<span class="Delimiter">;</span>
 <span id="L12" class="LineNr"> 12 </span>  <a href='012elf.cc.html#L20'>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="L13" class="LineNr"> 13 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a> &lt; <span class="Special"><a href='010---vm.cc.html#L194'>End_of_program</a></span><span class="Delimiter">)</span>  <span class="Comment">// weak final-gasp termination check</span>
 <span id="L14" class="LineNr"> 14 </span>    <a href='010---vm.cc.html#L296'>run_one_instruction</a><span class="Delimiter">();</span>
-<span id="L15" class="LineNr"> 15 </span>  <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;executed past end of the world: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L194'>End_of_program</a></span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L15" class="LineNr"> 15 </span>  <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;executed past end of the world: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L194'>End_of_program</a></span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L16" class="LineNr"> 16 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</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">:(code)</span>
 <span id="L20" class="LineNr"> 20 </span><span class="Normal">void</span> <a href='012elf.cc.html#L20'>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="L21" class="LineNr"> 21 </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="L22" class="LineNr"> 22 </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#L210'>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#L159'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span>
+<span id="L22" class="LineNr"> 22 </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#L190'>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#L159'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span>
 <span id="L23" class="LineNr"> 23 </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="L24" class="LineNr"> 24 </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="L25" class="LineNr"> 25 </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="L26" class="LineNr"> 26 </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#L210'>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#L159'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span>
+<span id="L26" class="LineNr"> 26 </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#L190'>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#L159'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span>
 <span id="L27" class="LineNr"> 27 </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="L28" class="LineNr"> 28 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size != read_size<span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>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#L159'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size != read_size<span class="Delimiter">)</span> <a href='003trace.cc.html#L190'>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#L159'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span>
 <span id="L29" class="LineNr"> 29 </span>  <a href='012elf.cc.html#L33'>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="L30" class="LineNr"> 30 </span>  free<span class="Delimiter">(</span>elf_contents<span class="Delimiter">);</span>
 <span id="L31" class="LineNr"> 31 </span><span class="Delimiter">}</span>
@@ -97,25 +97,25 @@ if ('onhashchange' in window) {
 <span id="L34" class="LineNr"> 34 </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="L35" class="LineNr"> 35 </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="L36" class="LineNr"> 36 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>memcmp<span class="Delimiter">(</span>magic<span class="Delimiter">,</span> <span class="Constant">&quot;\177ELF&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="L37" class="LineNr"> 37 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid ELF file; starts with \&quot;&quot; &lt;&lt; magic &lt;&lt; '&quot;</span>' &lt;&lt; <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span>
+<span id="L37" class="LineNr"> 37 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid ELF file; starts with \&quot;&quot; &lt;&lt; magic &lt;&lt; '&quot;</span>' &lt;&lt; <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span>
 <span id="L38" class="LineNr"> 38 </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="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;Only 32-bit ELF files (4-byte words; virtual addresses up to 4GB) supported.\n&quot;</span> &lt;&lt; <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span>
+<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;Only 32-bit ELF files (4-byte words; virtual addresses up to 4GB) supported.\n&quot;</span> &lt;&lt; <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span>
 <span id="L40" class="LineNr"> 40 </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="L41" class="LineNr"> 41 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;Only little-endian ELF files supported.\n&quot;</span> &lt;&lt; <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span>
+<span id="L41" class="LineNr"> 41 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;Only little-endian ELF files supported.\n&quot;</span> &lt;&lt; <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span>
 <span id="L42" class="LineNr"> 42 </span>  <span class="Comment">// unused: remaining 10 bytes of e_ident</span>
 <span id="L43" class="LineNr"> 43 </span>  <span class="Normal">uint32_t</span> e_machine_type = <a href='012elf.cc.html#L150'>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">if</span> <span class="Delimiter">(</span>e_machine_type != <span class="Constant">0x00030002</span><span class="Delimiter">)</span>
-<span id="L45" class="LineNr"> 45 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;ELF type/machine 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; e_machine_type &lt;&lt; <span class="Constant">&quot; isn't i386 executable\n&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
+<span id="L45" class="LineNr"> 45 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;ELF type/machine 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; e_machine_type &lt;&lt; <span class="Constant">&quot; isn't i386 executable\n&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Comment">// unused: e_version. We only support version 1, and later versions will be backwards compatible.</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Normal">uint32_t</span> e_entry = <a href='012elf.cc.html#L150'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">24</span>]<span class="Delimiter">);</span>
 <span id="L48" class="LineNr"> 48 </span>  <span class="Normal">uint32_t</span> e_phoff = <a href='012elf.cc.html#L150'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">28</span>]<span class="Delimiter">);</span>
 <span id="L49" class="LineNr"> 49 </span>  <span class="Comment">// unused: e_shoff</span>
 <span id="L50" class="LineNr"> 50 </span>  <span class="Comment">// unused: e_flags</span>
 <span id="L51" class="LineNr"> 51 </span>  <span class="Normal">uint32_t</span> e_ehsize = <a href='012elf.cc.html#L154'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">40</span>]<span class="Delimiter">);</span>
-<span id="L52" class="LineNr"> 52 </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#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; ELF header too small\n&quot;</span> &lt;&lt; <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span>
+<span id="L52" class="LineNr"> 52 </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#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; ELF header too small\n&quot;</span> &lt;&lt; <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span>
 <span id="L53" class="LineNr"> 53 </span>  <span class="Normal">uint32_t</span> e_phentsize = <a href='012elf.cc.html#L154'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">42</span>]<span class="Delimiter">);</span>
 <span id="L54" class="LineNr"> 54 </span>  <span class="Normal">uint32_t</span> e_phnum = <a href='012elf.cc.html#L154'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">44</span>]<span class="Delimiter">);</span>
-<span id="L55" class="LineNr"> 55 </span>  <a href='003trace.cc.html#L203'>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#L99'>program</a> header, each &quot;</span> &lt;&lt; e_phentsize &lt;&lt; <span class="Constant">&quot; bytes long&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L55" class="LineNr"> 55 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;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#L99'>program</a> header, each &quot;</span> &lt;&lt; e_phentsize &lt;&lt; <span class="Constant">&quot; bytes long&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L56" class="LineNr"> 56 </span>  <span class="Comment">// unused: e_shentsize</span>
 <span id="L57" class="LineNr"> 57 </span>  <span class="Comment">// unused: e_shnum</span>
 <span id="L58" class="LineNr"> 58 </span>  <span class="Comment">// unused: e_shstrndx</span>
@@ -151,34 +151,34 @@ if ('onhashchange' in window) {
 <span id="L88" class="LineNr"> 88 </span>
 <span id="L89" class="LineNr"> 89 </span><span class="Normal">void</span> <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L91" class="LineNr"> 91 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L92" class="LineNr"> 92 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; val &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L91" class="LineNr"> 91 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">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#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L92" class="LineNr"> 92 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pushing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; val &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L93" class="LineNr"> 93 </span>  <a href='010---vm.cc.html#L271'>write_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
 <span id="L94" class="LineNr"> 94 </span><span class="Delimiter">}</span>
 <span id="L95" class="LineNr"> 95 </span>
 <span id="L96" class="LineNr"> 96 </span><span class="Normal">void</span> <a href='012elf.cc.html#L96'>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">int</span> segment_index<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> set&lt;<span class="Normal">uint32_t</span>&gt;&amp; overlap<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L97" class="LineNr"> 97 </span>  <span class="Normal">uint32_t</span> p_type = <a href='012elf.cc.html#L150'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset]<span class="Delimiter">);</span>
-<span id="L98" class="LineNr"> 98 </span>  <a href='003trace.cc.html#L203'>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; end<span class="Delimiter">();</span>
+<span id="L98" class="LineNr"> 98 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;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; end<span class="Delimiter">();</span>
 <span id="L99" class="LineNr"> 99 </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="L100" class="LineNr">100 </span>    <a href='003trace.cc.html#L203'>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="L100" class="LineNr">100 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;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="L101" class="LineNr">101 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L102" class="LineNr">102 </span>  <span class="Delimiter">}</span>
 <span id="L103" class="LineNr">103 </span>  <span class="Normal">uint32_t</span> p_offset = <a href='012elf.cc.html#L150'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">4</span>]<span class="Delimiter">);</span>
 <span id="L104" class="LineNr">104 </span>  <span class="Normal">uint32_t</span> p_vaddr = <a href='012elf.cc.html#L150'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">8</span>]<span class="Delimiter">);</span>
-<span id="L105" class="LineNr">105 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &gt; p_vaddr<span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; <a href='011run.cc.html#L99'>program</a> header overlaps ELF header\n&quot;</span> &lt;&lt; <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &gt; p_vaddr<span class="Delimiter">)</span> <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; <a href='011run.cc.html#L99'>program</a> header overlaps ELF header\n&quot;</span> &lt;&lt; <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span>
 <span id="L106" class="LineNr">106 </span>  <span class="Comment">// unused: p_paddr</span>
 <span id="L107" class="LineNr">107 </span>  <span class="Normal">uint32_t</span> p_filesz = <a href='012elf.cc.html#L150'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">16</span>]<span class="Delimiter">);</span>
 <span id="L108" class="LineNr">108 </span>  <span class="Normal">uint32_t</span> p_memsz = <a href='012elf.cc.html#L150'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">20</span>]<span class="Delimiter">);</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_filesz != p_memsz<span class="Delimiter">)</span>
-<span id="L110" class="LineNr">110 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;Can't yet 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>)\n&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
+<span id="L110" class="LineNr">110 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;Can't yet 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>)\n&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
 <span id="L111" class="LineNr">111 </span>
 <span id="L112" class="LineNr">112 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_offset + p_filesz &gt; size<span class="Delimiter">)</span>
-<span id="L113" class="LineNr">113 </span>    <a href='003trace.cc.html#L210'>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 end 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#L168'>die</a><span class="Delimiter">();</span>
+<span id="L113" class="LineNr">113 </span>    <a href='003trace.cc.html#L190'>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 end 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#L168'>die</a><span class="Delimiter">();</span>
 <span id="L114" class="LineNr">114 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_memsz &gt;= <a href='010---vm.cc.html#L115'>SEGMENT_ALIGNMENT</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L115" class="LineNr">115 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;Code segment too small for SubX; for now please manually increase SEGMENT_ALIGNMENT.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L115" class="LineNr">115 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;Code segment too small for SubX; for now please manually increase SEGMENT_ALIGNMENT.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L116" class="LineNr">116 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L117" class="LineNr">117 </span>  <span class="Delimiter">}</span>
-<span id="L118" class="LineNr">118 </span>  <a href='003trace.cc.html#L203'>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; end<span class="Delimiter">();</span>
+<span id="L118" class="LineNr">118 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;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; end<span class="Delimiter">();</span>
 <span id="L119" class="LineNr">119 </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="L120" class="LineNr">120 </span>  <span class="Special"><a href='010---vm.cc.html#L180'>Mem</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span>p_vaddr<span class="Delimiter">));</span>
 <span id="L121" class="LineNr">121 </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 class="Delimiter">{</span>
@@ -231,7 +231,7 @@ if ('onhashchange' in window) {
 <span id="L168" class="LineNr">168 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L168'>die</a> <span class="Delimiter">{};</span>
 <span id="L169" class="LineNr">169 </span><span class="Delimiter">:(code)</span>
 <span id="L170" class="LineNr">170 </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#L168'>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="L171" class="LineNr">171 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Special"><a href='003trace.cc.html#L174'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span>
+<span id="L171" class="LineNr">171 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">)</span> <span class="Special"><a href='003trace.cc.html#L154'>Trace_stream</a></span><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L127'>newline</a><span class="Delimiter">();</span>
 <span id="L172" class="LineNr">172 </span>  exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L173" class="LineNr">173 </span><span class="Delimiter">}</span>
 <span id="L174" class="LineNr">174 </span>
diff --git a/html/subx/013direct_addressing.cc.html b/html/subx/013direct_addressing.cc.html
index d96502aa..787350c4 100644
--- a/html/subx/013direct_addressing.cc.html
+++ b/html/subx/013direct_addressing.cc.html
@@ -69,7 +69,7 @@ if ('onhashchange' in window) {
 <span id="L1" class="LineNr">  1 </span><span class="Comment">//: operating directly on a register</span>
 <span id="L2" class="LineNr">  2 </span>
 <span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;01&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add r32 to rm32 (add)&quot;</span><span class="Delimiter">);</span>
+<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;01&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add r32 to rm32 (add)&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_r32_to_r32)</span>
 <span id="L7" class="LineNr">  7 </span><span class="Special">% Reg[EAX].i = 0x10;</span>
@@ -86,7 +86,7 @@ if ('onhashchange' in window) {
 <span id="L18" class="LineNr"> 18 </span><span class="Normal">case</span> <span class="Constant">0x01</span>: <span class="Delimiter">{</span>  <span class="Comment">// add r32 to r/m32</span>
 <span id="L19" class="LineNr"> 19 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L20" class="LineNr"> 20 </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="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; end<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>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -102,7 +102,7 @@ if ('onhashchange' in window) {
 <span id="L34" class="LineNr"> 34 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rm = modrm &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mod == <span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L36" class="LineNr"> 36 </span>    <span class="Comment">// mod 3 is just register direct addressing</span>
-<span id="L37" class="LineNr"> 37 </span>    <a href='003trace.cc.html#L203'>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;r/m32 is &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L37" class="LineNr"> 37 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;r/m32 is &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L38" class="LineNr"> 38 </span>    <span class="Identifier">return</span> &amp;<span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rm]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Delimiter">}</span>
 <span id="L40" class="LineNr"> 40 </span>  <span class="Identifier">return</span> <a href='010---vm.cc.html#L248'>mem_addr_i32</a><span class="Delimiter">(</span><a href='013direct_addressing.cc.html#L43'>effective_address_number</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
@@ -116,7 +116,7 @@ if ('onhashchange' in window) {
 <span id="L48" class="LineNr"> 48 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L49" class="LineNr"> 49 </span>  <span class="Normal">case</span> <span class="Constant">3</span>:
 <span id="L50" class="LineNr"> 50 </span>    <span class="Comment">// mod 3 is just register direct addressing</span>
-<span id="L51" class="LineNr"> 51 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;unexpected direct addressing mode\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L51" class="LineNr"> 51 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;unexpected direct addressing mode\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L52" class="LineNr"> 52 </span>    <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L53" class="LineNr"> 53 </span>  <span class="Comment">// End Mod Special-cases(addr)</span>
 <span id="L54" class="LineNr"> 54 </span>  <span class="Normal">default</span>:
@@ -137,14 +137,14 @@ if ('onhashchange' in window) {
 <span id="L69" class="LineNr"> 69 </span>  <span class="Normal">case</span> <span class="Constant">5</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EBP&quot;</span><span class="Delimiter">;</span>
 <span id="L70" class="LineNr"> 70 </span>  <span class="Normal">case</span> <span class="Constant">6</span>: <span class="Identifier">return</span> <span class="Constant">&quot;ESI&quot;</span><span class="Delimiter">;</span>
 <span id="L71" class="LineNr"> 71 </span>  <span class="Normal">case</span> <span class="Constant">7</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EDI&quot;</span><span class="Delimiter">;</span>
-<span id="L72" class="LineNr"> 72 </span>  <span class="Normal">default</span>: <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid register &quot;</span> &lt;&lt; r &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>  <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Normal">default</span>: <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid register &quot;</span> &lt;&lt; r &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>  <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
 <span id="L73" class="LineNr"> 73 </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="SalientComment">//:: subtract</span>
 <span id="L77" class="LineNr"> 77 </span>
 <span id="L78" class="LineNr"> 78 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L79" class="LineNr"> 79 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;29&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract r32 from rm32 (sub)&quot;</span><span class="Delimiter">);</span>
+<span id="L79" class="LineNr"> 79 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;29&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract r32 from rm32 (sub)&quot;</span><span class="Delimiter">);</span>
 <span id="L80" class="LineNr"> 80 </span>
 <span id="L81" class="LineNr"> 81 </span><span class="Delimiter">:(scenario subtract_r32_from_r32)</span>
 <span id="L82" class="LineNr"> 82 </span><span class="Special">% Reg[EAX].i = 10;</span>
@@ -161,7 +161,7 @@ if ('onhashchange' in window) {
 <span id="L93" class="LineNr"> 93 </span><span class="Normal">case</span> <span class="Constant">0x29</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract r32 from r/m32</span>
 <span id="L94" class="LineNr"> 94 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L95" class="LineNr"> 95 </span>  <span class="Normal">const</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="L96" class="LineNr"> 96 </span>  <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; from r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L96" class="LineNr"> 96 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; from r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L97" class="LineNr"> 97 </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="L98" class="LineNr"> 98 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>
 <span id="L99" class="LineNr"> 99 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -170,7 +170,7 @@ if ('onhashchange' in window) {
 <span id="L102" class="LineNr">102 </span><span class="SalientComment">//:: multiply</span>
 <span id="L103" class="LineNr">103 </span>
 <span id="L104" class="LineNr">104 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L105" class="LineNr">105 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;negate/multiply rm32 (with <a href='010---vm.cc.html#L13'>EAX</a> if necessary) depending on subop (neg/mul)&quot;</span><span class="Delimiter">);</span>
+<span id="L105" class="LineNr">105 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;negate/multiply rm32 (with <a href='010---vm.cc.html#L13'>EAX</a> if necessary) depending on subop (neg/mul)&quot;</span><span class="Delimiter">);</span>
 <span id="L106" class="LineNr">106 </span>
 <span id="L107" class="LineNr">107 </span><span class="Delimiter">:(scenario multiply_eax_by_r32)</span>
 <span id="L108" class="LineNr">108 </span><span class="Special">% Reg[EAX].i = 4;</span>
@@ -187,17 +187,17 @@ if ('onhashchange' in window) {
 <span id="L119" class="LineNr">119 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L120" class="LineNr">120 </span><span class="Normal">case</span> <span class="Constant">0xf7</span>: <span class="Delimiter">{</span>
 <span id="L121" class="LineNr">121 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
-<span id="L122" class="LineNr">122 </span>  <a href='003trace.cc.html#L203'>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; end<span class="Delimiter">();</span>
+<span id="L122" class="LineNr">122 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;operate on r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L123" class="LineNr">123 </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="L124" class="LineNr">124 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
 <span id="L125" class="LineNr">125 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L126" class="LineNr">126 </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="L127" class="LineNr">127 </span>    <a href='003trace.cc.html#L203'>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; end<span class="Delimiter">();</span>
+<span id="L127" class="LineNr">127 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: multiply <a href='010---vm.cc.html#L13'>EAX</a> by r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L128" class="LineNr">128 </span>    <span class="Normal">const</span> <span class="Normal">uint64_t</span> result = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[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="L129" class="LineNr">129 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u = result &amp; <span class="Constant">0xffffffff</span><span class="Delimiter">;</span>
 <span id="L130" class="LineNr">130 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u = result &gt;&gt; <span class="Constant">32</span><span class="Delimiter">;</span>
 <span id="L131" class="LineNr">131 </span>    <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u != <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L132" class="LineNr">132 </span>    <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L132" class="LineNr">132 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L133" class="LineNr">133 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L134" class="LineNr">134 </span>  <span class="Delimiter">}</span>
 <span id="L135" class="LineNr">135 </span>  <span class="Comment">// End Op f7 Subops</span>
@@ -211,7 +211,7 @@ if ('onhashchange' in window) {
 <span id="L143" class="LineNr">143 </span><span class="Comment">//:</span>
 <span id="L144" class="LineNr">144 </span>
 <span id="L145" class="LineNr">145 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L146" class="LineNr">146 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;multiply rm32 into r32 (imul)&quot;</span><span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;multiply rm32 into r32 (imul)&quot;</span><span class="Delimiter">);</span>
 <span id="L147" class="LineNr">147 </span>
 <span id="L148" class="LineNr">148 </span><span class="Delimiter">:(scenario multiply_r32_into_r32)</span>
 <span id="L149" class="LineNr">149 </span><span class="Special">% Reg[EAX].i = 4;</span>
@@ -228,7 +228,7 @@ if ('onhashchange' in window) {
 <span id="L160" class="LineNr">160 </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="L161" class="LineNr">161 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L162" class="LineNr">162 </span>  <span class="Normal">const</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="L163" class="LineNr">163 </span>  <a href='003trace.cc.html#L203'>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#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L163" class="LineNr">163 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;multiply r/m32 into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L164" class="LineNr">164 </span>  <span class="Normal">const</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="L165" class="LineNr">165 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>*<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg1<span class="Delimiter">);</span>
 <span id="L166" class="LineNr">166 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -249,17 +249,17 @@ if ('onhashchange' in window) {
 <span id="L181" class="LineNr">181 </span>
 <span id="L182" class="LineNr">182 </span><span class="Delimiter">:(before &quot;End Op f7 Subops&quot;)</span>
 <span id="L183" class="LineNr">183 </span><span class="Normal">case</span> <span class="Constant">3</span>: <span class="Delimiter">{</span>  <span class="Comment">// negate r/m32</span>
-<span id="L184" class="LineNr">184 </span>  <a href='003trace.cc.html#L203'>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: negate&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L184" class="LineNr">184 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: negate&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L185" class="LineNr">185 </span>  <span class="Comment">// one case that can overflow</span>
 <span id="L186" class="LineNr">186 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span>*arg1<span class="Delimiter">)</span> == <span class="Constant">0x80000000</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L187" class="LineNr">187 </span>    <a href='003trace.cc.html#L203'>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;overflow&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L187" class="LineNr">187 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;overflow&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L188" class="LineNr">188 </span>    SF =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L189" class="LineNr">189 </span>    ZF =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L190" class="LineNr">190 </span>    <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> true</span><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>  *arg1 = -<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
-<span id="L194" class="LineNr">194 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L194" class="LineNr">194 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L195" class="LineNr">195 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
 <span id="L196" class="LineNr">196 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L197" class="LineNr">197 </span>  <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
@@ -280,7 +280,7 @@ if ('onhashchange' in window) {
 <span id="L212" class="LineNr">212 </span><span class="SalientComment">//:: shift left</span>
 <span id="L213" class="LineNr">213 </span>
 <span id="L214" class="LineNr">214 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L215" class="LineNr">215 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;d3&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;shift rm32 by CL bits depending on subop (sal/sar/shl/shr)&quot;</span><span class="Delimiter">);</span>
+<span id="L215" class="LineNr">215 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;d3&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;shift rm32 by CL bits depending on subop (sal/sar/shl/shr)&quot;</span><span class="Delimiter">);</span>
 <span id="L216" class="LineNr">216 </span>
 <span id="L217" class="LineNr">217 </span><span class="Delimiter">:(scenario shift_left_r32_with_cl)</span>
 <span id="L218" class="LineNr">218 </span><span class="Special">% Reg[EBX].i = 13;</span>
@@ -297,12 +297,12 @@ if ('onhashchange' in window) {
 <span id="L229" class="LineNr">229 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L230" class="LineNr">230 </span><span class="Normal">case</span> <span class="Constant">0xd3</span>: <span class="Delimiter">{</span>
 <span id="L231" class="LineNr">231 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
-<span id="L232" class="LineNr">232 </span>  <a href='003trace.cc.html#L203'>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; end<span class="Delimiter">();</span>
+<span id="L232" class="LineNr">232 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;operate on r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L233" class="LineNr">233 </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="L234" class="LineNr">234 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
 <span id="L235" class="LineNr">235 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L236" class="LineNr">236 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift left r/m32 by CL</span>
-<span id="L237" class="LineNr">237 </span>    <a href='003trace.cc.html#L203'>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: shift left by CL bits&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L237" class="LineNr">237 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift left by CL bits&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L238" class="LineNr">238 </span>    <span class="Normal">uint8_t</span> count = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
 <span id="L239" class="LineNr">239 </span>    <span class="Comment">// OF is only defined if count is 1</span>
 <span id="L240" class="LineNr">240 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -313,7 +313,7 @@ if ('onhashchange' in window) {
 <span id="L245" class="LineNr">245 </span>    *arg1 = <span class="Delimiter">(</span>*arg1 &lt;&lt; count<span class="Delimiter">);</span>
 <span id="L246" class="LineNr">246 </span>    ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L247" class="LineNr">247 </span>    SF = <span class="Delimiter">(</span>*arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L248" class="LineNr">248 </span>    <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L248" class="LineNr">248 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L249" class="LineNr">249 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L250" class="LineNr">250 </span>  <span class="Delimiter">}</span>
 <span id="L251" class="LineNr">251 </span>  <span class="Comment">// End Op d3 Subops</span>
@@ -340,14 +340,14 @@ if ('onhashchange' in window) {
 <span id="L272" class="LineNr">272 </span>
 <span id="L273" class="LineNr">273 </span><span class="Delimiter">:(before &quot;End Op d3 Subops&quot;)</span>
 <span id="L274" class="LineNr">274 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift right r/m32 by CL, preserving sign</span>
-<span id="L275" class="LineNr">275 </span>  <a href='003trace.cc.html#L203'>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: shift right by CL bits, while preserving sign&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L275" class="LineNr">275 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift right by CL bits, while preserving sign&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L276" class="LineNr">276 </span>  <span class="Normal">uint8_t</span> count = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
 <span id="L277" class="LineNr">277 </span>  *arg1 = <span class="Delimiter">(</span>*arg1 &gt;&gt; count<span class="Delimiter">);</span>
 <span id="L278" class="LineNr">278 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L279" class="LineNr">279 </span>  SF = <span class="Delimiter">(</span>*arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L280" class="LineNr">280 </span>  <span class="Comment">// OF is only defined if count is 1</span>
 <span id="L281" class="LineNr">281 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L282" class="LineNr">282 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L282" class="LineNr">282 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L283" class="LineNr">283 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L284" class="LineNr">284 </span><span class="Delimiter">}</span>
 <span id="L285" class="LineNr">285 </span>
@@ -393,7 +393,7 @@ if ('onhashchange' in window) {
 <span id="L325" class="LineNr">325 </span>
 <span id="L326" class="LineNr">326 </span><span class="Delimiter">:(before &quot;End Op d3 Subops&quot;)</span>
 <span id="L327" class="LineNr">327 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift right r/m32 by CL, preserving sign</span>
-<span id="L328" class="LineNr">328 </span>  <a href='003trace.cc.html#L203'>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: shift right by CL bits, while padding zeroes&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L328" class="LineNr">328 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift right by CL bits, while padding zeroes&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L329" class="LineNr">329 </span>  <span class="Normal">uint8_t</span> count = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
 <span id="L330" class="LineNr">330 </span>  <span class="Comment">// OF is only defined if count is 1</span>
 <span id="L331" class="LineNr">331 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -406,7 +406,7 @@ if ('onhashchange' in window) {
 <span id="L338" class="LineNr">338 </span>  ZF = <span class="Delimiter">(</span>*uarg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L339" class="LineNr">339 </span>  <span class="Comment">// result is always positive by definition</span>
 <span id="L340" class="LineNr">340 </span>  SF =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L341" class="LineNr">341 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L341" class="LineNr">341 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L342" class="LineNr">342 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L343" class="LineNr">343 </span><span class="Delimiter">}</span>
 <span id="L344" class="LineNr">344 </span>
@@ -438,7 +438,7 @@ if ('onhashchange' in window) {
 <span id="L370" class="LineNr">370 </span><span class="SalientComment">//:: and</span>
 <span id="L371" class="LineNr">371 </span>
 <span id="L372" class="LineNr">372 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L373" class="LineNr">373 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise AND of r32 with rm32 (and)&quot;</span><span class="Delimiter">);</span>
+<span id="L373" class="LineNr">373 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise AND of r32 with rm32 (and)&quot;</span><span class="Delimiter">);</span>
 <span id="L374" class="LineNr">374 </span>
 <span id="L375" class="LineNr">375 </span><span class="Delimiter">:(scenario and_r32_with_r32)</span>
 <span id="L376" class="LineNr">376 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
@@ -455,7 +455,7 @@ if ('onhashchange' in window) {
 <span id="L387" class="LineNr">387 </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="L388" class="LineNr">388 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L389" class="LineNr">389 </span>  <span class="Normal">const</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="L390" class="LineNr">390 </span>  <a href='003trace.cc.html#L203'>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#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L390" class="LineNr">390 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L391" class="LineNr">391 </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="L392" class="LineNr">392 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L393" class="LineNr">393 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -464,7 +464,7 @@ if ('onhashchange' in window) {
 <span id="L396" class="LineNr">396 </span><span class="SalientComment">//:: or</span>
 <span id="L397" class="LineNr">397 </span>
 <span id="L398" class="LineNr">398 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L399" class="LineNr">399 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise OR of r32 with rm32 (or)&quot;</span><span class="Delimiter">);</span>
+<span id="L399" class="LineNr">399 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise OR of r32 with rm32 (or)&quot;</span><span class="Delimiter">);</span>
 <span id="L400" class="LineNr">400 </span>
 <span id="L401" class="LineNr">401 </span><span class="Delimiter">:(scenario or_r32_with_r32)</span>
 <span id="L402" class="LineNr">402 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
@@ -481,7 +481,7 @@ if ('onhashchange' in window) {
 <span id="L413" class="LineNr">413 </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="L414" class="LineNr">414 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L415" class="LineNr">415 </span>  <span class="Normal">const</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="L416" class="LineNr">416 </span>  <a href='003trace.cc.html#L203'>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#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L416" class="LineNr">416 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L417" class="LineNr">417 </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="L418" class="LineNr">418 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L419" class="LineNr">419 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -490,7 +490,7 @@ if ('onhashchange' in window) {
 <span id="L422" class="LineNr">422 </span><span class="SalientComment">//:: xor</span>
 <span id="L423" class="LineNr">423 </span>
 <span id="L424" class="LineNr">424 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L425" class="LineNr">425 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise XOR of r32 with rm32 (xor)&quot;</span><span class="Delimiter">);</span>
+<span id="L425" class="LineNr">425 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise XOR of r32 with rm32 (xor)&quot;</span><span class="Delimiter">);</span>
 <span id="L426" class="LineNr">426 </span>
 <span id="L427" class="LineNr">427 </span><span class="Delimiter">:(scenario xor_r32_with_r32)</span>
 <span id="L428" class="LineNr">428 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
@@ -507,7 +507,7 @@ if ('onhashchange' in window) {
 <span id="L439" class="LineNr">439 </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="L440" class="LineNr">440 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L441" class="LineNr">441 </span>  <span class="Normal">const</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="L442" class="LineNr">442 </span>  <a href='003trace.cc.html#L203'>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#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L442" class="LineNr">442 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L443" class="LineNr">443 </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="L444" class="LineNr">444 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L445" class="LineNr">445 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -528,9 +528,9 @@ if ('onhashchange' in window) {
 <span id="L460" class="LineNr">460 </span>
 <span id="L461" class="LineNr">461 </span><span class="Delimiter">:(before &quot;End Op f7 Subops&quot;)</span>
 <span id="L462" class="LineNr">462 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span>  <span class="Comment">// not r/m32</span>
-<span id="L463" class="LineNr">463 </span>  <a href='003trace.cc.html#L203'>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; end<span class="Delimiter">();</span>
+<span id="L463" class="LineNr">463 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: not&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L464" class="LineNr">464 </span>  *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
-<span id="L465" class="LineNr">465 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L465" class="LineNr">465 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L466" class="LineNr">466 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
 <span id="L467" class="LineNr">467 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L468" class="LineNr">468 </span>  <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
@@ -540,7 +540,7 @@ if ('onhashchange' in window) {
 <span id="L472" class="LineNr">472 </span><span class="SalientComment">//:: compare (cmp)</span>
 <span id="L473" class="LineNr">473 </span>
 <span id="L474" class="LineNr">474 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L475" class="LineNr">475 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if rm32 &lt; r32 (cmp)&quot;</span><span class="Delimiter">);</span>
+<span id="L475" class="LineNr">475 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if rm32 &lt; r32 (cmp)&quot;</span><span class="Delimiter">);</span>
 <span id="L476" class="LineNr">476 </span>
 <span id="L477" class="LineNr">477 </span><span class="Delimiter">:(scenario compare_r32_with_r32_greater)</span>
 <span id="L478" class="LineNr">478 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
@@ -557,7 +557,7 @@ if ('onhashchange' in window) {
 <span id="L489" class="LineNr">489 </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="L490" class="LineNr">490 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L491" class="LineNr">491 </span>  <span class="Normal">const</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="L492" class="LineNr">492 </span>  <a href='003trace.cc.html#L203'>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#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L492" class="LineNr">492 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L493" class="LineNr">493 </span>  <span class="Normal">const</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="L494" class="LineNr">494 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
 <span id="L495" class="LineNr">495 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
@@ -565,7 +565,7 @@ if ('onhashchange' in window) {
 <span id="L497" class="LineNr">497 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L498" class="LineNr">498 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
 <span id="L499" class="LineNr">499 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L500" class="LineNr">500 </span>  <a href='003trace.cc.html#L203'>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#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L500" class="LineNr">500 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L501" class="LineNr">501 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L502" class="LineNr">502 </span><span class="Delimiter">}</span>
 <span id="L503" class="LineNr">503 </span>
@@ -594,7 +594,7 @@ if ('onhashchange' in window) {
 <span id="L526" class="LineNr">526 </span><span class="SalientComment">//:: copy (mov)</span>
 <span id="L527" class="LineNr">527 </span>
 <span id="L528" class="LineNr">528 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L529" class="LineNr">529 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r32 to rm32 (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L529" class="LineNr">529 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r32 to rm32 (mov)&quot;</span><span class="Delimiter">);</span>
 <span id="L530" class="LineNr">530 </span>
 <span id="L531" class="LineNr">531 </span><span class="Delimiter">:(scenario copy_r32_to_r32)</span>
 <span id="L532" class="LineNr">532 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
@@ -610,17 +610,17 @@ if ('onhashchange' in window) {
 <span id="L542" class="LineNr">542 </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="L543" class="LineNr">543 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L544" class="LineNr">544 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rsrc = <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="L545" class="LineNr">545 </span>  <a href='003trace.cc.html#L203'>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#L62'>rname</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L545" class="LineNr">545 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L546" class="LineNr">546 </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="L547" class="LineNr">547 </span>  *dest = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rsrc]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L548" class="LineNr">548 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; *dest &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L548" class="LineNr">548 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *dest &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L549" class="LineNr">549 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L550" class="LineNr">550 </span><span class="Delimiter">}</span>
 <span id="L551" class="LineNr">551 </span>
 <span id="L552" class="LineNr">552 </span><span class="SalientComment">//:: xchg</span>
 <span id="L553" class="LineNr">553 </span>
 <span id="L554" class="LineNr">554 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L555" class="LineNr">555 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;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 (xchg)&quot;</span><span class="Delimiter">);</span>
+<span id="L555" class="LineNr">555 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;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 (xchg)&quot;</span><span class="Delimiter">);</span>
 <span id="L556" class="LineNr">556 </span>
 <span id="L557" class="LineNr">557 </span><span class="Delimiter">:(scenario xchg_r32_with_r32)</span>
 <span id="L558" class="LineNr">558 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
@@ -638,27 +638,27 @@ if ('onhashchange' in window) {
 <span id="L570" class="LineNr">570 </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="L571" class="LineNr">571 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L572" class="LineNr">572 </span>  <span class="Normal">const</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="L573" class="LineNr">573 </span>  <a href='003trace.cc.html#L203'>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#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L573" class="LineNr">573 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;exchange &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L574" class="LineNr">574 </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="L575" class="LineNr">575 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp = *arg1<span class="Delimiter">;</span>
 <span id="L576" class="LineNr">576 </span>  *arg1 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
 <span id="L577" class="LineNr">577 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i = tmp<span class="Delimiter">;</span>
-<span id="L578" class="LineNr">578 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <span class="Constant">&quot; in r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L579" class="LineNr">579 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i &lt;&lt; <span class="Constant">&quot; in &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L578" class="LineNr">578 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <span class="Constant">&quot; in r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L579" class="LineNr">579 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i &lt;&lt; <span class="Constant">&quot; in &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L580" class="LineNr">580 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L581" class="LineNr">581 </span><span class="Delimiter">}</span>
 <span id="L582" class="LineNr">582 </span>
 <span id="L583" class="LineNr">583 </span><span class="SalientComment">//:: increment</span>
 <span id="L584" class="LineNr">584 </span>
 <span id="L585" class="LineNr">585 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L586" class="LineNr">586 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;40&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L13'>EAX</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L587" class="LineNr">587 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;41&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L14'>ECX</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L588" class="LineNr">588 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;42&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L15'>EDX</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L589" class="LineNr">589 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;43&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L16'>EBX</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L590" class="LineNr">590 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;44&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L17'>ESP</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L591" class="LineNr">591 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;45&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L18'>EBP</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L592" class="LineNr">592 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;46&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L19'>ESI</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L593" class="LineNr">593 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;47&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L20'>EDI</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L586" class="LineNr">586 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;40&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L13'>EAX</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L587" class="LineNr">587 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;41&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L14'>ECX</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L588" class="LineNr">588 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;42&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L15'>EDX</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L589" class="LineNr">589 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;43&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L16'>EBX</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L590" class="LineNr">590 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;44&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L17'>ESP</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L591" class="LineNr">591 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;45&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L18'>EBP</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L592" class="LineNr">592 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;46&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L19'>ESI</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L593" class="LineNr">593 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;47&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L20'>EDI</a> (inc)&quot;</span><span class="Delimiter">);</span>
 <span id="L594" class="LineNr">594 </span>
 <span id="L595" class="LineNr">595 </span><span class="Delimiter">:(scenario increment_r32)</span>
 <span id="L596" class="LineNr">596 </span><span class="Special">% Reg[ECX].u = 0x1f;</span>
@@ -678,14 +678,14 @@ if ('onhashchange' in window) {
 <span id="L610" class="LineNr">610 </span><span class="Normal">case</span> <span class="Constant">0x46</span>:
 <span id="L611" class="LineNr">611 </span><span class="Normal">case</span> <span class="Constant">0x47</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r32</span>
 <span id="L612" class="LineNr">612 </span>  <span class="Normal">const</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="L613" class="LineNr">613 </span>  <a href='003trace.cc.html#L203'>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;increment &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L613" class="LineNr">613 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L614" class="LineNr">614 </span>  ++<span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L615" class="LineNr">615 </span>  <a href='003trace.cc.html#L203'>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 value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L615" class="LineNr">615 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L616" class="LineNr">616 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L617" class="LineNr">617 </span><span class="Delimiter">}</span>
 <span id="L618" class="LineNr">618 </span>
 <span id="L619" class="LineNr">619 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L620" class="LineNr">620 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment/decrement/jump/push/call rm32 based on subop (inc/dec/jmp/push/call)&quot;</span><span class="Delimiter">);</span>
+<span id="L620" class="LineNr">620 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment/decrement/jump/push/call rm32 based on subop (inc/dec/jmp/push/call)&quot;</span><span class="Delimiter">);</span>
 <span id="L621" class="LineNr">621 </span>
 <span id="L622" class="LineNr">622 </span><span class="Delimiter">:(scenario increment_rm32)</span>
 <span id="L623" class="LineNr">623 </span><span class="Special">% Reg[EAX].u = 0x20;</span>
@@ -703,15 +703,15 @@ if ('onhashchange' in window) {
 <span id="L635" class="LineNr">635 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
 <span id="L636" class="LineNr">636 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L637" class="LineNr">637 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r/m32</span>
-<span id="L638" class="LineNr">638 </span>      <a href='003trace.cc.html#L203'>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;increment r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L638" class="LineNr">638 </span>      <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L639" class="LineNr">639 </span>      <span class="Normal">int32_t</span>* <a href='001help.cc.html#L15'>arg</a> = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L640" class="LineNr">640 </span>      ++*arg<span class="Delimiter">;</span>
-<span id="L641" class="LineNr">641 </span>      <a href='003trace.cc.html#L203'>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 value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L641" class="LineNr">641 </span>      <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L642" class="LineNr">642 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L643" class="LineNr">643 </span>    <span class="Delimiter">}</span>
 <span id="L644" class="LineNr">644 </span>    <span class="Normal">default</span>:
 <span id="L645" class="LineNr">645 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for ff: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L412'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L646" class="LineNr">646 </span>      <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L646" class="LineNr">646 </span>      <a href='003trace.cc.html#L187'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L647" class="LineNr">647 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L648" class="LineNr">648 </span>    <span class="Comment">// End Op ff Subops</span>
 <span id="L649" class="LineNr">649 </span>  <span class="Delimiter">}</span>
@@ -721,14 +721,14 @@ if ('onhashchange' in window) {
 <span id="L653" class="LineNr">653 </span><span class="SalientComment">//:: decrement</span>
 <span id="L654" class="LineNr">654 </span>
 <span id="L655" class="LineNr">655 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L656" class="LineNr">656 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;48&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L13'>EAX</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L657" class="LineNr">657 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;49&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L14'>ECX</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L658" class="LineNr">658 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L15'>EDX</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L659" class="LineNr">659 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L16'>EBX</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L660" class="LineNr">660 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L17'>ESP</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L661" class="LineNr">661 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L18'>EBP</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L662" class="LineNr">662 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L19'>ESI</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L663" class="LineNr">663 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L20'>EDI</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L656" class="LineNr">656 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;48&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L13'>EAX</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L657" class="LineNr">657 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;49&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L14'>ECX</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L658" class="LineNr">658 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L15'>EDX</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L659" class="LineNr">659 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L16'>EBX</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L660" class="LineNr">660 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L17'>ESP</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L661" class="LineNr">661 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L18'>EBP</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L662" class="LineNr">662 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L19'>ESI</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L663" class="LineNr">663 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L20'>EDI</a> (dec)&quot;</span><span class="Delimiter">);</span>
 <span id="L664" class="LineNr">664 </span>
 <span id="L665" class="LineNr">665 </span><span class="Delimiter">:(scenario decrement_r32)</span>
 <span id="L666" class="LineNr">666 </span><span class="Special">% Reg[ECX].u = 0x1f;</span>
@@ -748,9 +748,9 @@ if ('onhashchange' in window) {
 <span id="L680" class="LineNr">680 </span><span class="Normal">case</span> <span class="Constant">0x4e</span>:
 <span id="L681" class="LineNr">681 </span><span class="Normal">case</span> <span class="Constant">0x4f</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r32</span>
 <span id="L682" class="LineNr">682 </span>  <span class="Normal">const</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="L683" class="LineNr">683 </span>  <a href='003trace.cc.html#L203'>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;decrement &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L683" class="LineNr">683 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L684" class="LineNr">684 </span>  --<span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L685" class="LineNr">685 </span>  <a href='003trace.cc.html#L203'>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 value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L685" class="LineNr">685 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L686" class="LineNr">686 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L687" class="LineNr">687 </span><span class="Delimiter">}</span>
 <span id="L688" class="LineNr">688 </span>
@@ -766,24 +766,24 @@ if ('onhashchange' in window) {
 <span id="L698" class="LineNr">698 </span>
 <span id="L699" class="LineNr">699 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
 <span id="L700" class="LineNr">700 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r/m32</span>
-<span id="L701" class="LineNr">701 </span>  <a href='003trace.cc.html#L203'>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;decrement r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L701" class="LineNr">701 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L702" class="LineNr">702 </span>  <span class="Normal">int32_t</span>* <a href='001help.cc.html#L15'>arg</a> = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L703" class="LineNr">703 </span>  --*arg<span class="Delimiter">;</span>
-<span id="L704" class="LineNr">704 </span>  <a href='003trace.cc.html#L203'>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 value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L704" class="LineNr">704 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L705" class="LineNr">705 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L706" class="LineNr">706 </span><span class="Delimiter">}</span>
 <span id="L707" class="LineNr">707 </span>
 <span id="L708" class="LineNr">708 </span><span class="SalientComment">//:: push</span>
 <span id="L709" class="LineNr">709 </span>
 <span id="L710" class="LineNr">710 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L711" class="LineNr">711 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L13'>EAX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L712" class="LineNr">712 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L14'>ECX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L713" class="LineNr">713 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L15'>EDX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L714" class="LineNr">714 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L16'>EBX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L715" class="LineNr">715 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L17'>ESP</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L716" class="LineNr">716 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L18'>EBP</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L717" class="LineNr">717 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L19'>ESI</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L718" class="LineNr">718 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L20'>EDI</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L711" class="LineNr">711 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L13'>EAX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L712" class="LineNr">712 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L14'>ECX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L713" class="LineNr">713 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L15'>EDX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L714" class="LineNr">714 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L16'>EBX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L715" class="LineNr">715 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L17'>ESP</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L716" class="LineNr">716 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L18'>EBP</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L717" class="LineNr">717 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L19'>ESI</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L718" class="LineNr">718 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L20'>EDI</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
 <span id="L719" class="LineNr">719 </span>
 <span id="L720" class="LineNr">720 </span><span class="Delimiter">:(scenario push_r32)</span>
 <span id="L721" class="LineNr">721 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
@@ -805,7 +805,7 @@ if ('onhashchange' in window) {
 <span id="L737" class="LineNr">737 </span><span class="Normal">case</span> <span class="Constant">0x56</span>:
 <span id="L738" class="LineNr">738 </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="L739" class="LineNr">739 </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="L740" class="LineNr">740 </span>  <a href='003trace.cc.html#L203'>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#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L740" class="LineNr">740 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L741" class="LineNr">741 </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="L742" class="LineNr">742 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L743" class="LineNr">743 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -814,14 +814,14 @@ if ('onhashchange' in window) {
 <span id="L746" class="LineNr">746 </span><span class="SalientComment">//:: pop</span>
 <span id="L747" class="LineNr">747 </span>
 <span id="L748" class="LineNr">748 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L749" class="LineNr">749 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L13'>EAX</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L750" class="LineNr">750 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L14'>ECX</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L751" class="LineNr">751 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L15'>EDX</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L752" class="LineNr">752 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L16'>EBX</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L753" class="LineNr">753 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L17'>ESP</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L754" class="LineNr">754 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L18'>EBP</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L755" class="LineNr">755 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L19'>ESI</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L756" class="LineNr">756 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L20'>EDI</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L749" class="LineNr">749 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L13'>EAX</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L750" class="LineNr">750 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L14'>ECX</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L751" class="LineNr">751 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L15'>EDX</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L752" class="LineNr">752 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L16'>EBX</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L753" class="LineNr">753 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L17'>ESP</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L754" class="LineNr">754 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L18'>EBP</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L755" class="LineNr">755 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L19'>ESI</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L756" class="LineNr">756 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L20'>EDI</a> (pop)&quot;</span><span class="Delimiter">);</span>
 <span id="L757" class="LineNr">757 </span>
 <span id="L758" class="LineNr">758 </span><span class="Delimiter">:(scenario pop_r32)</span>
 <span id="L759" class="LineNr">759 </span><span class="Special">% Reg[ESP].u = 0x02000000;</span>
@@ -846,7 +846,7 @@ if ('onhashchange' in window) {
 <span id="L778" class="LineNr">778 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
 <span id="L779" class="LineNr">779 </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="L780" class="LineNr">780 </span>  <span class="Normal">const</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="L781" class="LineNr">781 </span>  <a href='003trace.cc.html#L203'>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#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L781" class="LineNr">781 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L782" class="LineNr">782 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;pop from &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
 <span id="L783" class="LineNr">783 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L788'>pop</a><span class="Delimiter">();</span>
 <span id="L784" class="LineNr">784 </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>
@@ -855,9 +855,9 @@ if ('onhashchange' in window) {
 <span id="L787" class="LineNr">787 </span><span class="Delimiter">:(code)</span>
 <span id="L788" class="LineNr">788 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L788'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L789" class="LineNr">789 </span>  <span class="Normal">const</span> <span class="Normal">uint32_t</span> result = <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L790" class="LineNr">790 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; result &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L790" class="LineNr">790 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;popping value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; result &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L791" class="LineNr">791 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L792" class="LineNr">792 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L792" class="LineNr">792 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L793" class="LineNr">793 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L794" class="LineNr">794 </span><span class="Delimiter">}</span>
 </pre>
diff --git a/html/subx/014indirect_addressing.cc.html b/html/subx/014indirect_addressing.cc.html
index 0a272f9a..bd8f7e4d 100644
--- a/html/subx/014indirect_addressing.cc.html
+++ b/html/subx/014indirect_addressing.cc.html
@@ -85,7 +85,7 @@ if ('onhashchange' in window) {
 <span id="L18" class="LineNr"> 18 </span><span class="Normal">case</span> <span class="Constant">0</span>:  <span class="Comment">// indirect addressing</span>
 <span id="L19" class="LineNr"> 19 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Normal">default</span>:  <span class="Comment">// address in register</span>
-<span id="L21" class="LineNr"> 21 </span>    <a href='003trace.cc.html#L203'>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; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rm]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">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; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rm]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L22" class="LineNr"> 22 </span>    addr = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
 <span id="L23" class="LineNr"> 23 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Comment">// End Mod 0 Special-cases(addr)</span>
@@ -95,7 +95,7 @@ if ('onhashchange' in window) {
 <span id="L28" class="LineNr"> 28 </span><span class="Comment">//:</span>
 <span id="L29" class="LineNr"> 29 </span>
 <span id="L30" class="LineNr"> 30 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L31" class="LineNr"> 31 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;03&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add rm32 to r32 (add)&quot;</span><span class="Delimiter">);</span>
+<span id="L31" class="LineNr"> 31 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;03&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add rm32 to r32 (add)&quot;</span><span class="Delimiter">);</span>
 <span id="L32" class="LineNr"> 32 </span>
 <span id="L33" class="LineNr"> 33 </span><span class="Delimiter">:(scenario add_mem_at_r32_to_r32)</span>
 <span id="L34" class="LineNr"> 34 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
@@ -114,7 +114,7 @@ if ('onhashchange' in window) {
 <span id="L47" class="LineNr"> 47 </span><span class="Normal">case</span> <span class="Constant">0x03</span>: <span class="Delimiter">{</span>  <span class="Comment">// add r/m32 to r32</span>
 <span id="L48" class="LineNr"> 48 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L49" class="LineNr"> 49 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <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="L50" class="LineNr"> 50 </span>  <a href='003trace.cc.html#L203'>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 r/m32 to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L50" class="LineNr"> 50 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add r/m32 to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L51" class="LineNr"> 51 </span>  <span class="Normal">const</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="L52" class="LineNr"> 52 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
 <span id="L53" class="LineNr"> 53 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -138,7 +138,7 @@ if ('onhashchange' in window) {
 <span id="L71" class="LineNr"> 71 </span><span class="Comment">//:</span>
 <span id="L72" class="LineNr"> 72 </span>
 <span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L74" class="LineNr"> 74 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract rm32 from r32 (sub)&quot;</span><span class="Delimiter">);</span>
+<span id="L74" class="LineNr"> 74 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract rm32 from r32 (sub)&quot;</span><span class="Delimiter">);</span>
 <span id="L75" class="LineNr"> 75 </span>
 <span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(scenario subtract_mem_at_r32_from_r32)</span>
 <span id="L77" class="LineNr"> 77 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
@@ -157,7 +157,7 @@ if ('onhashchange' in window) {
 <span id="L90" class="LineNr"> 90 </span><span class="Normal">case</span> <span class="Constant">0x2b</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract r/m32 from r32</span>
 <span id="L91" class="LineNr"> 91 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <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="L93" class="LineNr"> 93 </span>  <a href='003trace.cc.html#L203'>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 r/m32 from &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L93" class="LineNr"> 93 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract r/m32 from &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L94" class="LineNr"> 94 </span>  <span class="Normal">const</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="L95" class="LineNr"> 95 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>i<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>
@@ -181,7 +181,7 @@ if ('onhashchange' in window) {
 <span id="L114" class="LineNr">114 </span><span class="Comment">//:</span>
 <span id="L115" class="LineNr">115 </span>
 <span id="L116" class="LineNr">116 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L117" class="LineNr">117 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise AND of r32 with rm32 (and)&quot;</span><span class="Delimiter">);</span>
+<span id="L117" class="LineNr">117 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise AND of r32 with rm32 (and)&quot;</span><span class="Delimiter">);</span>
 <span id="L118" class="LineNr">118 </span>
 <span id="L119" class="LineNr">119 </span><span class="Delimiter">:(scenario and_mem_at_r32_with_r32)</span>
 <span id="L120" class="LineNr">120 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
@@ -200,7 +200,7 @@ if ('onhashchange' in window) {
 <span id="L133" class="LineNr">133 </span><span class="Normal">case</span> <span class="Constant">0x23</span>: <span class="Delimiter">{</span>  <span class="Comment">// and r/m32 with r32</span>
 <span id="L134" class="LineNr">134 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L135" class="LineNr">135 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <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#L203'>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 r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L136" class="LineNr">136 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L137" class="LineNr">137 </span>  <span class="Normal">const</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="L138" class="LineNr">138 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
 <span id="L139" class="LineNr">139 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -224,7 +224,7 @@ if ('onhashchange' in window) {
 <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">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L160" class="LineNr">160 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise OR of r32 with rm32 (or)&quot;</span><span class="Delimiter">);</span>
+<span id="L160" class="LineNr">160 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise OR of r32 with rm32 (or)&quot;</span><span class="Delimiter">);</span>
 <span id="L161" class="LineNr">161 </span>
 <span id="L162" class="LineNr">162 </span><span class="Delimiter">:(scenario or_mem_at_r32_with_r32)</span>
 <span id="L163" class="LineNr">163 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
@@ -243,7 +243,7 @@ if ('onhashchange' in window) {
 <span id="L176" class="LineNr">176 </span><span class="Normal">case</span> <span class="Constant">0x0b</span>: <span class="Delimiter">{</span>  <span class="Comment">// or r/m32 with r32</span>
 <span id="L177" class="LineNr">177 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L178" class="LineNr">178 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <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="L179" class="LineNr">179 </span>  <a href='003trace.cc.html#L203'>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 r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L179" class="LineNr">179 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L180" class="LineNr">180 </span>  <span class="Normal">const</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="L181" class="LineNr">181 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>u<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>
@@ -267,7 +267,7 @@ if ('onhashchange' in window) {
 <span id="L200" class="LineNr">200 </span><span class="Comment">//:</span>
 <span id="L201" class="LineNr">201 </span>
 <span id="L202" class="LineNr">202 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L203" class="LineNr">203 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;33&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise XOR of r32 with rm32 (xor)&quot;</span><span class="Delimiter">);</span>
+<span id="L203" class="LineNr">203 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;33&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise XOR of r32 with rm32 (xor)&quot;</span><span class="Delimiter">);</span>
 <span id="L204" class="LineNr">204 </span>
 <span id="L205" class="LineNr">205 </span><span class="Delimiter">:(scenario xor_mem_at_r32_with_r32)</span>
 <span id="L206" class="LineNr">206 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
@@ -286,7 +286,7 @@ if ('onhashchange' in window) {
 <span id="L219" class="LineNr">219 </span><span class="Normal">case</span> <span class="Constant">0x33</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r/m32 with r32</span>
 <span id="L220" class="LineNr">220 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L221" class="LineNr">221 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <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="L222" class="LineNr">222 </span>  <a href='003trace.cc.html#L203'>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 r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L222" class="LineNr">222 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L223" class="LineNr">223 </span>  <span class="Normal">const</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="L224" class="LineNr">224 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
 <span id="L225" class="LineNr">225 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -351,7 +351,7 @@ if ('onhashchange' in window) {
 <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&quot;)</span>
-<span id="L287" class="LineNr">287 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if r32 &lt; rm32 (cmp)&quot;</span><span class="Delimiter">);</span>
+<span id="L287" class="LineNr">287 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if r32 &lt; rm32 (cmp)&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 = 0x2000;</span>
@@ -370,7 +370,7 @@ if ('onhashchange' in window) {
 <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">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L305" class="LineNr">305 </span>  <span class="Normal">const</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#L203'>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#L62'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L306" class="LineNr">306 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L307" class="LineNr">307 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg1 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg1]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
 <span id="L308" class="LineNr">308 </span>  <span class="Normal">const</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">const</span> <span class="Normal">int32_t</span> tmp1 = arg1 - *arg2<span class="Delimiter">;</span>
@@ -378,7 +378,7 @@ if ('onhashchange' in window) {
 <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#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L314" class="LineNr">314 </span>  <a href='003trace.cc.html#L203'>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#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L314" class="LineNr">314 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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#L81'>OF</a> &lt;&lt; end<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>
@@ -424,7 +424,7 @@ if ('onhashchange' in window) {
 <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&quot;)</span>
-<span id="L360" class="LineNr">360 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy rm32 to r32 (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L360" class="LineNr">360 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy rm32 to r32 (mov)&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 = 0x2000;</span>
@@ -442,10 +442,10 @@ if ('onhashchange' in window) {
 <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">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L377" class="LineNr">377 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest = <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#L203'>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#L62'>rname</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L378" class="LineNr">378 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy r/m32 to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L379" class="LineNr">379 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* src = <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>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rdest]<span class="Delimiter">.</span>i = *src<span class="Delimiter">;</span>
-<span id="L381" class="LineNr">381 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; *src &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L381" class="LineNr">381 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *src &lt;&lt; end<span class="Delimiter">();</span>
 <span id="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>
@@ -470,10 +470,10 @@ if ('onhashchange' in window) {
 <span id="L403" class="LineNr">403 </span>
 <span id="L404" class="LineNr">404 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
 <span id="L405" class="LineNr">405 </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="L406" class="LineNr">406 </span>  <a href='003trace.cc.html#L203'>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; end<span class="Delimiter">();</span>
+<span id="L406" class="LineNr">406 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L407" class="LineNr">407 </span>  <span class="Normal">const</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="L408" class="LineNr">408 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = *arg2<span class="Delimiter">;</span>
-<span id="L409" class="LineNr">409 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L409" class="LineNr">409 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<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>
@@ -495,7 +495,7 @@ if ('onhashchange' in window) {
 <span id="L428" class="LineNr">428 </span>
 <span id="L429" class="LineNr">429 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
 <span id="L430" class="LineNr">430 </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="L431" class="LineNr">431 </span>  <a href='003trace.cc.html#L203'>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; end<span class="Delimiter">();</span>
+<span id="L431" class="LineNr">431 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L432" class="LineNr">432 </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="L433" class="LineNr">433 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>*val<span class="Delimiter">);</span>
 <span id="L434" class="LineNr">434 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -504,7 +504,7 @@ if ('onhashchange' in window) {
 <span id="L437" class="LineNr">437 </span><span class="SalientComment">//:: pop</span>
 <span id="L438" class="LineNr">438 </span>
 <span id="L439" class="LineNr">439 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L440" class="LineNr">440 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to rm32 (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L440" class="LineNr">440 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to rm32 (pop)&quot;</span><span class="Delimiter">);</span>
 <span id="L441" class="LineNr">441 </span>
 <span id="L442" class="LineNr">442 </span><span class="Delimiter">:(scenario pop_mem_at_r32)</span>
 <span id="L443" class="LineNr">443 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
@@ -526,7 +526,7 @@ if ('onhashchange' in window) {
 <span id="L459" class="LineNr">459 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
 <span id="L460" class="LineNr">460 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L461" class="LineNr">461 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>
-<span id="L462" class="LineNr">462 </span>      <a href='003trace.cc.html#L203'>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; end<span class="Delimiter">();</span>
+<span id="L462" class="LineNr">462 </span>      <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L463" class="LineNr">463 </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="L464" class="LineNr">464 </span>      *dest = <a href='013direct_addressing.cc.html#L788'>pop</a><span class="Delimiter">();</span>
 <span id="L465" class="LineNr">465 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -552,7 +552,7 @@ if ('onhashchange' in window) {
 <span id="L485" class="LineNr">485 </span><span class="Delimiter">:(before &quot;End Mod 0 Special-cases(addr)&quot;)</span>
 <span id="L486" class="LineNr">486 </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="L487" class="LineNr">487 </span>  addr = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L488" class="LineNr">488 </span>  <a href='003trace.cc.html#L203'>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; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L488" class="LineNr">488 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L489" class="LineNr">489 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L490" class="LineNr">490 </span>
 <span id="L491" class="LineNr">491 </span><span class="Comment">//:</span>
@@ -576,13 +576,13 @@ if ('onhashchange' in window) {
 <span id="L509" class="LineNr">509 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L510" class="LineNr">510 </span>  <span class="Normal">default</span>:
 <span id="L511" class="LineNr">511 </span>    addr = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L512" class="LineNr">512 </span>    <a href='003trace.cc.html#L203'>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; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L512" class="LineNr">512 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<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="Comment">// End Mod 1 Special-cases(addr)</span>
 <span id="L515" class="LineNr">515 </span>  <span class="Delimiter">}</span>
 <span id="L516" class="LineNr">516 </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="L517" class="LineNr">517 </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#L364'>next</a><span class="Delimiter">());</span>
-<span id="L518" class="LineNr">518 </span>    <a href='003trace.cc.html#L203'>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; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp8)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L518" class="LineNr">518 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp8)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L519" class="LineNr">519 </span>  <span class="Delimiter">}</span>
 <span id="L520" class="LineNr">520 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L521" class="LineNr">521 </span>
@@ -621,13 +621,13 @@ if ('onhashchange' in window) {
 <span id="L554" class="LineNr">554 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L555" class="LineNr">555 </span>  <span class="Normal">default</span>:
 <span id="L556" class="LineNr">556 </span>    addr = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L557" class="LineNr">557 </span>    <a href='003trace.cc.html#L203'>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; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L557" class="LineNr">557 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<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 class="Comment">// End Mod 2 Special-cases(addr)</span>
 <span id="L560" class="LineNr">560 </span>  <span class="Delimiter">}</span>
 <span id="L561" class="LineNr">561 </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="L562" class="LineNr">562 </span>    addr += <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L563" class="LineNr">563 </span>    <a href='003trace.cc.html#L203'>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; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp32)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L563" class="LineNr">563 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp32)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L564" class="LineNr">564 </span>  <span class="Delimiter">}</span>
 <span id="L565" class="LineNr">565 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L566" class="LineNr">566 </span>
@@ -648,7 +648,7 @@ if ('onhashchange' in window) {
 <span id="L581" class="LineNr">581 </span><span class="SalientComment">//:: copy address (lea)</span>
 <span id="L582" class="LineNr">582 </span>
 <span id="L583" class="LineNr">583 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L584" class="LineNr">584 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy address in rm32 into r32 (lea)&quot;</span><span class="Delimiter">);</span>
+<span id="L584" class="LineNr">584 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy address in rm32 into r32 (lea)&quot;</span><span class="Delimiter">);</span>
 <span id="L585" class="LineNr">585 </span>
 <span id="L586" class="LineNr">586 </span><span class="Delimiter">:(scenario copy_address)</span>
 <span id="L587" class="LineNr">587 </span><span class="Special">% Reg[EAX].u = 0x2000;</span>
@@ -663,7 +663,7 @@ if ('onhashchange' in window) {
 <span id="L596" class="LineNr">596 </span><span class="Normal">case</span> <span class="Constant">0x8d</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy address of m32 to r32</span>
 <span id="L597" class="LineNr">597 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L598" class="LineNr">598 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <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="L599" class="LineNr">599 </span>  <a href='003trace.cc.html#L203'>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 address into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L599" class="LineNr">599 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy address into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L600" class="LineNr">600 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg1]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L43'>effective_address_number</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L601" class="LineNr">601 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L602" class="LineNr">602 </span><span class="Delimiter">}</span>
diff --git a/html/subx/015immediate_addressing.cc.html b/html/subx/015immediate_addressing.cc.html
index edf0fbec..989e30a5 100644
--- a/html/subx/015immediate_addressing.cc.html
+++ b/html/subx/015immediate_addressing.cc.html
@@ -68,7 +68,7 @@ if ('onhashchange' in window) {
 <span id="L1" class="LineNr">  1 </span><span class="Comment">//: instructions that (immediately) contain an argument to act with</span>
 <span id="L2" class="LineNr">  2 </span>
 <span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;combine rm32 with imm32 based on subop (add/sub/and/or/xor/cmp)&quot;</span><span class="Delimiter">);</span>
+<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;combine rm32 with imm32 based on subop (add/sub/and/or/xor/cmp)&quot;</span><span class="Delimiter">);</span>
 <span id="L5" class="LineNr">  5 </span>
 <span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(scenario add_imm32_to_r32)</span>
 <span id="L7" class="LineNr">  7 </span><span class="Special">% Reg[EBX].i = 1;</span>
@@ -84,15 +84,15 @@ if ('onhashchange' in window) {
 <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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;combine imm32 with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L20" class="LineNr"> 20 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;combine imm32 with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L22" class="LineNr"> 22 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L24" class="LineNr"> 24 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L24" class="LineNr"> 24 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
 <span id="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#L203'>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; end<span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop add&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L29" class="LineNr"> 29 </span>    <a href='010---vm.cc.html#L91'>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>
@@ -122,7 +122,7 @@ if ('onhashchange' in window) {
 <span id="L55" class="LineNr"> 55 </span><span class="SalientComment">//:: subtract</span>
 <span id="L56" class="LineNr"> 56 </span>
 <span id="L57" class="LineNr"> 57 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L58" class="LineNr"> 58 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract imm32 from <a href='010---vm.cc.html#L13'>EAX</a> (sub)&quot;</span><span class="Delimiter">);</span>
+<span id="L58" class="LineNr"> 58 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract imm32 from <a href='010---vm.cc.html#L13'>EAX</a> (sub)&quot;</span><span class="Delimiter">);</span>
 <span id="L59" class="LineNr"> 59 </span>
 <span id="L60" class="LineNr"> 60 </span><span class="Delimiter">:(scenario subtract_imm32_from_eax)</span>
 <span id="L61" class="LineNr"> 61 </span><span class="Special">% Reg[EAX].i = 0x0d0c0baa;</span>
@@ -135,7 +135,7 @@ if ('onhashchange' in window) {
 <span id="L68" class="LineNr"> 68 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L69" class="LineNr"> 69 </span><span class="Normal">case</span> <span class="Constant">0x2d</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract imm32 from EAX</span>
 <span id="L70" class="LineNr"> 70 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L71" class="LineNr"> 71 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L71" class="LineNr"> 71 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L72" class="LineNr"> 72 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L73" class="LineNr"> 73 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L74" class="LineNr"> 74 </span><span class="Delimiter">}</span>
@@ -158,7 +158,7 @@ if ('onhashchange' in window) {
 <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#L203'>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; end<span class="Delimiter">();</span>
+<span id="L94" class="LineNr"> 94 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop subtract&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L95" class="LineNr"> 95 </span>  <a href='010---vm.cc.html#L91'>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>
@@ -180,7 +180,7 @@ if ('onhashchange' in window) {
 <span id="L113" class="LineNr">113 </span><span class="SalientComment">//:: shift left</span>
 <span id="L114" class="LineNr">114 </span>
 <span id="L115" class="LineNr">115 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L116" class="LineNr">116 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c1&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;shift rm32 by imm8 bits depending on subop (sal/sar/shl/shr)&quot;</span><span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c1&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;shift rm32 by imm8 bits depending on subop (sal/sar/shl/shr)&quot;</span><span class="Delimiter">);</span>
 <span id="L117" class="LineNr">117 </span>
 <span id="L118" class="LineNr">118 </span><span class="Delimiter">:(scenario shift_left_r32_with_imm8)</span>
 <span id="L119" class="LineNr">119 </span><span class="Special">% Reg[EBX].i = 13;</span>
@@ -196,12 +196,12 @@ if ('onhashchange' in window) {
 <span id="L129" class="LineNr">129 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L130" class="LineNr">130 </span><span class="Normal">case</span> <span class="Constant">0xc1</span>: <span class="Delimiter">{</span>
 <span id="L131" class="LineNr">131 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
-<span id="L132" class="LineNr">132 </span>  <a href='003trace.cc.html#L203'>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; end<span class="Delimiter">();</span>
+<span id="L132" class="LineNr">132 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;operate on r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L133" class="LineNr">133 </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="L134" class="LineNr">134 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
 <span id="L135" class="LineNr">135 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L136" class="LineNr">136 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift left r/m32 by CL</span>
-<span id="L137" class="LineNr">137 </span>    <a href='003trace.cc.html#L203'>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: shift left by CL bits&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L137" class="LineNr">137 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift left by CL bits&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L138" class="LineNr">138 </span>    <span class="Normal">uint8_t</span> count = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">()</span> &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
 <span id="L139" class="LineNr">139 </span>    <span class="Comment">// OF is only defined if count is 1</span>
 <span id="L140" class="LineNr">140 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -212,7 +212,7 @@ if ('onhashchange' in window) {
 <span id="L145" class="LineNr">145 </span>    *arg1 = <span class="Delimiter">(</span>*arg1 &lt;&lt; count<span class="Delimiter">);</span>
 <span id="L146" class="LineNr">146 </span>    ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L147" class="LineNr">147 </span>    SF = <span class="Delimiter">(</span>*arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L148" class="LineNr">148 </span>    <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L148" class="LineNr">148 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L149" class="LineNr">149 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L150" class="LineNr">150 </span>  <span class="Delimiter">}</span>
 <span id="L151" class="LineNr">151 </span>  <span class="Comment">// End Op c1 Subops</span>
@@ -238,14 +238,14 @@ if ('onhashchange' in window) {
 <span id="L171" class="LineNr">171 </span>
 <span id="L172" class="LineNr">172 </span><span class="Delimiter">:(before &quot;End Op c1 Subops&quot;)</span>
 <span id="L173" class="LineNr">173 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift right r/m32 by CL, preserving sign</span>
-<span id="L174" class="LineNr">174 </span>  <a href='003trace.cc.html#L203'>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: shift right by CL bits, while preserving sign&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L174" class="LineNr">174 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift right by CL bits, while preserving sign&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L175" class="LineNr">175 </span>  <span class="Normal">uint8_t</span> count = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">()</span> &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
 <span id="L176" class="LineNr">176 </span>  *arg1 = <span class="Delimiter">(</span>*arg1 &gt;&gt; count<span class="Delimiter">);</span>
 <span id="L177" class="LineNr">177 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L178" class="LineNr">178 </span>  SF = <span class="Delimiter">(</span>*arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L179" class="LineNr">179 </span>  <span class="Comment">// OF is only defined if count is 1</span>
 <span id="L180" class="LineNr">180 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L181" class="LineNr">181 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L181" class="LineNr">181 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<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>
@@ -288,7 +288,7 @@ if ('onhashchange' in window) {
 <span id="L221" class="LineNr">221 </span>
 <span id="L222" class="LineNr">222 </span><span class="Delimiter">:(before &quot;End Op c1 Subops&quot;)</span>
 <span id="L223" class="LineNr">223 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift right r/m32 by CL, preserving sign</span>
-<span id="L224" class="LineNr">224 </span>  <a href='003trace.cc.html#L203'>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: shift right by CL bits, while padding zeroes&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L224" class="LineNr">224 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift right by CL bits, while padding zeroes&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L225" class="LineNr">225 </span>  <span class="Normal">uint8_t</span> count = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">()</span> &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
 <span id="L226" class="LineNr">226 </span>  <span class="Comment">// OF is only defined if count is 1</span>
 <span id="L227" class="LineNr">227 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -301,7 +301,7 @@ if ('onhashchange' in window) {
 <span id="L234" class="LineNr">234 </span>  ZF = <span class="Delimiter">(</span>*uarg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L235" class="LineNr">235 </span>  <span class="Comment">// result is always positive by definition</span>
 <span id="L236" class="LineNr">236 </span>  SF =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L237" class="LineNr">237 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L237" class="LineNr">237 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L238" class="LineNr">238 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L239" class="LineNr">239 </span><span class="Delimiter">}</span>
 <span id="L240" class="LineNr">240 </span>
@@ -331,7 +331,7 @@ if ('onhashchange' in window) {
 <span id="L264" class="LineNr">264 </span><span class="SalientComment">//:: and</span>
 <span id="L265" class="LineNr">265 </span>
 <span id="L266" class="LineNr">266 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L267" class="LineNr">267 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise AND of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (and)&quot;</span><span class="Delimiter">);</span>
+<span id="L267" class="LineNr">267 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise AND of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (and)&quot;</span><span class="Delimiter">);</span>
 <span id="L268" class="LineNr">268 </span>
 <span id="L269" class="LineNr">269 </span><span class="Delimiter">:(scenario and_imm32_with_eax)</span>
 <span id="L270" class="LineNr">270 </span><span class="Special">% Reg[EAX].i = 0xff;</span>
@@ -344,7 +344,7 @@ if ('onhashchange' in window) {
 <span id="L277" class="LineNr">277 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L278" class="LineNr">278 </span><span class="Normal">case</span> <span class="Constant">0x25</span>: <span class="Delimiter">{</span>  <span class="Comment">// and imm32 with EAX</span>
 <span id="L279" class="LineNr">279 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L280" class="LineNr">280 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L280" class="LineNr">280 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L281" class="LineNr">281 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L282" class="LineNr">282 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L283" class="LineNr">283 </span><span class="Delimiter">}</span>
@@ -367,7 +367,7 @@ if ('onhashchange' in window) {
 <span id="L300" class="LineNr">300 </span>
 <span id="L301" class="LineNr">301 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L302" class="LineNr">302 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>
-<span id="L303" class="LineNr">303 </span>  <a href='003trace.cc.html#L203'>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; end<span class="Delimiter">();</span>
+<span id="L303" class="LineNr">303 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop and&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L304" class="LineNr">304 </span>  <a href='010---vm.cc.html#L103'>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="L305" class="LineNr">305 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L306" class="LineNr">306 </span><span class="Delimiter">}</span>
@@ -389,7 +389,7 @@ if ('onhashchange' in window) {
 <span id="L322" class="LineNr">322 </span><span class="SalientComment">//:: or</span>
 <span id="L323" class="LineNr">323 </span>
 <span id="L324" class="LineNr">324 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L325" class="LineNr">325 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise OR of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (or)&quot;</span><span class="Delimiter">);</span>
+<span id="L325" class="LineNr">325 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise OR of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (or)&quot;</span><span class="Delimiter">);</span>
 <span id="L326" class="LineNr">326 </span>
 <span id="L327" class="LineNr">327 </span><span class="Delimiter">:(scenario or_imm32_with_eax)</span>
 <span id="L328" class="LineNr">328 </span><span class="Special">% Reg[EAX].i = 0xd0c0b0a0;</span>
@@ -402,7 +402,7 @@ if ('onhashchange' in window) {
 <span id="L335" class="LineNr">335 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L336" class="LineNr">336 </span><span class="Normal">case</span> <span class="Constant">0x0d</span>: <span class="Delimiter">{</span>  <span class="Comment">// or imm32 with EAX</span>
 <span id="L337" class="LineNr">337 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L338" class="LineNr">338 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L338" class="LineNr">338 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L339" class="LineNr">339 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L340" class="LineNr">340 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L341" class="LineNr">341 </span><span class="Delimiter">}</span>
@@ -425,7 +425,7 @@ if ('onhashchange' in window) {
 <span id="L358" class="LineNr">358 </span>
 <span id="L359" class="LineNr">359 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L360" class="LineNr">360 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>
-<span id="L361" class="LineNr">361 </span>  <a href='003trace.cc.html#L203'>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; end<span class="Delimiter">();</span>
+<span id="L361" class="LineNr">361 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop or&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L362" class="LineNr">362 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L363" class="LineNr">363 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L364" class="LineNr">364 </span><span class="Delimiter">}</span>
@@ -445,7 +445,7 @@ if ('onhashchange' in window) {
 <span id="L378" class="LineNr">378 </span><span class="SalientComment">//:: xor</span>
 <span id="L379" class="LineNr">379 </span>
 <span id="L380" class="LineNr">380 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L381" class="LineNr">381 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise XOR of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (xor)&quot;</span><span class="Delimiter">);</span>
+<span id="L381" class="LineNr">381 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise XOR of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (xor)&quot;</span><span class="Delimiter">);</span>
 <span id="L382" class="LineNr">382 </span>
 <span id="L383" class="LineNr">383 </span><span class="Delimiter">:(scenario xor_imm32_with_eax)</span>
 <span id="L384" class="LineNr">384 </span><span class="Special">% Reg[EAX].i = 0xddccb0a0;</span>
@@ -458,7 +458,7 @@ if ('onhashchange' in window) {
 <span id="L391" class="LineNr">391 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L392" class="LineNr">392 </span><span class="Normal">case</span> <span class="Constant">0x35</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor imm32 with EAX</span>
 <span id="L393" class="LineNr">393 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L394" class="LineNr">394 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L394" class="LineNr">394 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L395" class="LineNr">395 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L396" class="LineNr">396 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L397" class="LineNr">397 </span><span class="Delimiter">}</span>
@@ -481,7 +481,7 @@ if ('onhashchange' in window) {
 <span id="L414" class="LineNr">414 </span>
 <span id="L415" class="LineNr">415 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L416" class="LineNr">416 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>
-<span id="L417" class="LineNr">417 </span>  <a href='003trace.cc.html#L203'>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; end<span class="Delimiter">();</span>
+<span id="L417" class="LineNr">417 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop xor&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L418" class="LineNr">418 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L419" class="LineNr">419 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L420" class="LineNr">420 </span><span class="Delimiter">}</span>
@@ -501,7 +501,7 @@ if ('onhashchange' in window) {
 <span id="L434" class="LineNr">434 </span><span class="SalientComment">//:: compare (cmp)</span>
 <span id="L435" class="LineNr">435 </span>
 <span id="L436" class="LineNr">436 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L437" class="LineNr">437 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if <a href='010---vm.cc.html#L13'>EAX</a> &lt; imm32 (cmp)&quot;</span><span class="Delimiter">);</span>
+<span id="L437" class="LineNr">437 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if <a href='010---vm.cc.html#L13'>EAX</a> &lt; imm32 (cmp)&quot;</span><span class="Delimiter">);</span>
 <span id="L438" class="LineNr">438 </span>
 <span id="L439" class="LineNr">439 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_greater)</span>
 <span id="L440" class="LineNr">440 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b0a;</span>
@@ -515,13 +515,13 @@ if ('onhashchange' in window) {
 <span id="L448" class="LineNr">448 </span><span class="Normal">case</span> <span class="Constant">0x3d</span>: <span class="Delimiter">{</span>  <span class="Comment">// compare EAX with imm32</span>
 <span id="L449" class="LineNr">449 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg1 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
 <span id="L450" class="LineNr">450 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L451" class="LineNr">451 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L451" class="LineNr">451 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L452" class="LineNr">452 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span>
 <span id="L453" class="LineNr">453 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L454" class="LineNr">454 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L455" class="LineNr">455 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = arg1 - arg2<span class="Delimiter">;</span>
 <span id="L456" class="LineNr">456 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L457" class="LineNr">457 </span>  <a href='003trace.cc.html#L203'>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#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L457" class="LineNr">457 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L458" class="LineNr">458 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L459" class="LineNr">459 </span><span class="Delimiter">}</span>
 <span id="L460" class="LineNr">460 </span>
@@ -556,13 +556,13 @@ if ('onhashchange' in window) {
 <span id="L489" class="LineNr">489 </span>
 <span id="L490" class="LineNr">490 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L491" class="LineNr">491 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>
-<span id="L492" class="LineNr">492 </span>  <a href='003trace.cc.html#L203'>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; end<span class="Delimiter">();</span>
+<span id="L492" class="LineNr">492 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop compare&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L493" class="LineNr">493 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
 <span id="L494" class="LineNr">494 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L495" class="LineNr">495 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L496" class="LineNr">496 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
 <span id="L497" class="LineNr">497 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L498" class="LineNr">498 </span>  <a href='003trace.cc.html#L203'>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#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L498" class="LineNr">498 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L499" class="LineNr">499 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L500" class="LineNr">500 </span><span class="Delimiter">}</span>
 <span id="L501" class="LineNr">501 </span>
@@ -631,14 +631,14 @@ if ('onhashchange' in window) {
 <span id="L564" class="LineNr">564 </span><span class="SalientComment">//:: copy (mov)</span>
 <span id="L565" class="LineNr">565 </span>
 <span id="L566" class="LineNr">566 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L567" class="LineNr">567 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L13'>EAX</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L568" class="LineNr">568 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L14'>ECX</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L569" class="LineNr">569 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L15'>EDX</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L570" class="LineNr">570 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L16'>EBX</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L571" class="LineNr">571 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L17'>ESP</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L572" class="LineNr">572 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L18'>EBP</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L573" class="LineNr">573 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L19'>ESI</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L574" class="LineNr">574 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L20'>EDI</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L567" class="LineNr">567 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L13'>EAX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L568" class="LineNr">568 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L14'>ECX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L569" class="LineNr">569 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L15'>EDX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L570" class="LineNr">570 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L16'>EBX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L571" class="LineNr">571 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L17'>ESP</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L572" class="LineNr">572 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L18'>EBP</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L573" class="LineNr">573 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L19'>ESI</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L574" class="LineNr">574 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L20'>EDI</a> (mov)&quot;</span><span class="Delimiter">);</span>
 <span id="L575" class="LineNr">575 </span>
 <span id="L576" class="LineNr">576 </span><span class="Delimiter">:(scenario copy_imm32_to_r32)</span>
 <span id="L577" class="LineNr">577 </span>== <span class="Constant">0x1</span>
@@ -657,7 +657,7 @@ if ('onhashchange' in window) {
 <span id="L590" class="LineNr">590 </span><span class="Normal">case</span> <span class="Constant">0xbf</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
 <span id="L591" class="LineNr">591 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
 <span id="L592" class="LineNr">592 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L593" class="LineNr">593 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; src &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L593" class="LineNr">593 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; src &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L594" class="LineNr">594 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rdest]<span class="Delimiter">.</span>i = src<span class="Delimiter">;</span>
 <span id="L595" class="LineNr">595 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L596" class="LineNr">596 </span><span class="Delimiter">}</span>
@@ -665,7 +665,7 @@ if ('onhashchange' in window) {
 <span id="L598" class="LineNr">598 </span><span class="Comment">//:</span>
 <span id="L599" class="LineNr">599 </span>
 <span id="L600" class="LineNr">600 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L601" class="LineNr">601 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to rm32 (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L601" class="LineNr">601 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to rm32 (mov)&quot;</span><span class="Delimiter">);</span>
 <span id="L602" class="LineNr">602 </span>
 <span id="L603" class="LineNr">603 </span><span class="Delimiter">:(scenario copy_imm32_to_mem_at_r32)</span>
 <span id="L604" class="LineNr">604 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
@@ -680,10 +680,10 @@ if ('onhashchange' in window) {
 <span id="L613" class="LineNr">613 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L614" class="LineNr">614 </span><span class="Normal">case</span> <span class="Constant">0xc7</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
 <span id="L615" class="LineNr">615 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
-<span id="L616" class="LineNr">616 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L616" class="LineNr">616 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L617" class="LineNr">617 </span>  <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L618" class="LineNr">618 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L619" class="LineNr">619 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; src &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L619" class="LineNr">619 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; src &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L620" class="LineNr">620 </span>  *dest = src<span class="Delimiter">;</span>
 <span id="L621" class="LineNr">621 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L622" class="LineNr">622 </span><span class="Delimiter">}</span>
@@ -691,7 +691,7 @@ if ('onhashchange' in window) {
 <span id="L624" class="LineNr">624 </span><span class="SalientComment">//:: push</span>
 <span id="L625" class="LineNr">625 </span>
 <span id="L626" class="LineNr">626 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L627" class="LineNr">627 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push imm32 to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L627" class="LineNr">627 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push imm32 to stack (push)&quot;</span><span class="Delimiter">);</span>
 <span id="L628" class="LineNr">628 </span>
 <span id="L629" class="LineNr">629 </span><span class="Delimiter">:(scenario push_imm32)</span>
 <span id="L630" class="LineNr">630 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
@@ -705,11 +705,11 @@ if ('onhashchange' in window) {
 <span id="L638" class="LineNr">638 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L639" class="LineNr">639 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span>
 <span id="L640" class="LineNr">640 </span>  <span class="Normal">const</span> <span class="Normal">uint32_t</span> val = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L343'>next32</a><span class="Delimiter">());</span>
-<span id="L641" class="LineNr">641 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; val &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L641" class="LineNr">641 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; val &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L642" class="LineNr">642 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: &quot; &lt;&lt; val &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
 <span id="L643" class="LineNr">643 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
-<span id="L644" class="LineNr">644 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ESP is now 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L645" class="LineNr">645 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;contents at <a href='010---vm.cc.html#L17'>ESP</a>: 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L644" class="LineNr">644 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ESP is now 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L645" class="LineNr">645 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;contents at <a href='010---vm.cc.html#L17'>ESP</a>: 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L646" class="LineNr">646 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L647" class="LineNr">647 </span><span class="Delimiter">}</span>
 </pre>
diff --git a/html/subx/016index_addressing.cc.html b/html/subx/016index_addressing.cc.html
index b4707946..daab35a8 100644
--- a/html/subx/016index_addressing.cc.html
+++ b/html/subx/016index_addressing.cc.html
@@ -91,22 +91,22 @@ if ('onhashchange' in window) {
 <span id="L26" class="LineNr"> 26 </span>  <span class="Normal">uint32_t</span> addr = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L27" class="LineNr"> 27 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base != <a href='010---vm.cc.html#L18'>EBP</a> || mod != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L28" class="LineNr"> 28 </span>    addr = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[base]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L29" class="LineNr"> 29 </span>    <a href='003trace.cc.html#L203'>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; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>base<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L29" class="LineNr"> 29 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>base<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <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#L343'>next32</a><span class="Delimiter">();</span>  <span class="Comment">// ignore base</span>
-<span id="L34" class="LineNr"> 34 </span>    <a href='003trace.cc.html#L203'>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; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L34" class="LineNr"> 34 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; end<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">const</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>
 <span id="L37" class="LineNr"> 37 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>index == <a href='010---vm.cc.html#L17'>ESP</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L38" class="LineNr"> 38 </span>    <span class="Comment">// ignore index and scale</span>
-<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L203'>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; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L40" class="LineNr"> 40 </span>  <span class="Delimiter">}</span>
 <span id="L41" class="LineNr"> 41 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L42" class="LineNr"> 42 </span>    <span class="Normal">const</span> <span class="Normal">uint8_t</span> scale = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; <span class="Delimiter">(</span>sib&gt;&gt;<span class="Constant">6</span><span class="Delimiter">));</span>
 <span id="L43" class="LineNr"> 43 </span>    addr += <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[index]<span class="Delimiter">.</span>i*scale<span class="Delimiter">;</span>  <span class="Comment">// treat index register as signed. Maybe base as well? But we'll always ensure it's non-negative.</span>
-<span id="L44" class="LineNr"> 44 </span>    <a href='003trace.cc.html#L203'>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; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>index<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;*&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>scale<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L44" class="LineNr"> 44 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>index<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;*&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>scale<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Delimiter">}</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Identifier">return</span> addr<span class="Delimiter">;</span>
 <span id="L47" class="LineNr"> 47 </span><span class="Delimiter">}</span>
diff --git a/html/subx/017jump_disp8.cc.html b/html/subx/017jump_disp8.cc.html
index 39c5a3e8..a88e01ab 100644
--- a/html/subx/017jump_disp8.cc.html
+++ b/html/subx/017jump_disp8.cc.html
@@ -69,7 +69,7 @@ if ('onhashchange' in window) {
 <span id="L3" class="LineNr">  3 </span><span class="SalientComment">//:: jump</span>
 <span id="L4" class="LineNr">  4 </span>
 <span id="L5" class="LineNr">  5 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L6" class="LineNr">  6 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;eb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away (jmp)&quot;</span><span class="Delimiter">);</span>
+<span id="L6" class="LineNr">  6 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;eb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away (jmp)&quot;</span><span class="Delimiter">);</span>
 <span id="L7" class="LineNr">  7 </span>
 <span id="L8" class="LineNr">  8 </span><span class="Delimiter">:(scenario jump_rel8)</span>
 <span id="L9" class="LineNr">  9 </span>== <span class="Constant">0x1</span>
@@ -85,7 +85,7 @@ if ('onhashchange' in window) {
 <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L20" class="LineNr"> 20 </span><span class="Normal">case</span> <span class="Constant">0xeb</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">());</span>
-<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<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>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L25" class="LineNr"> 25 </span><span class="Delimiter">}</span>
@@ -93,7 +93,7 @@ if ('onhashchange' in window) {
 <span id="L27" class="LineNr"> 27 </span><span class="SalientComment">//:: jump if equal/zero</span>
 <span id="L28" class="LineNr"> 28 </span>
 <span id="L29" class="LineNr"> 29 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L30" class="LineNr"> 30 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;74&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if equal, if ZF is set (jcc/jz/je)&quot;</span><span class="Delimiter">);</span>
+<span id="L30" class="LineNr"> 30 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;74&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if equal, if ZF is set (jcc/jz/je)&quot;</span><span class="Delimiter">);</span>
 <span id="L31" class="LineNr"> 31 </span>
 <span id="L32" class="LineNr"> 32 </span><span class="Delimiter">:(scenario je_rel8_success)</span>
 <span id="L33" class="LineNr"> 33 </span><span class="Special">% ZF = true;</span>
@@ -111,7 +111,7 @@ if ('onhashchange' in window) {
 <span id="L45" class="LineNr"> 45 </span><span class="Normal">case</span> <span class="Constant">0x74</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if ZF</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">());</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L48" class="LineNr"> 48 </span>    <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L48" class="LineNr"> 48 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L49" class="LineNr"> 49 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L50" class="LineNr"> 50 </span>  <span class="Delimiter">}</span>
 <span id="L51" class="LineNr"> 51 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -132,7 +132,7 @@ if ('onhashchange' in window) {
 <span id="L66" class="LineNr"> 66 </span><span class="SalientComment">//:: jump if not equal/not zero</span>
 <span id="L67" class="LineNr"> 67 </span>
 <span id="L68" class="LineNr"> 68 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L69" class="LineNr"> 69 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;75&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if not equal, if ZF is not set (jcc/jnz/jne)&quot;</span><span class="Delimiter">);</span>
+<span id="L69" class="LineNr"> 69 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;75&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if not equal, if ZF is not set (jcc/jnz/jne)&quot;</span><span class="Delimiter">);</span>
 <span id="L70" class="LineNr"> 70 </span>
 <span id="L71" class="LineNr"> 71 </span><span class="Delimiter">:(scenario jne_rel8_success)</span>
 <span id="L72" class="LineNr"> 72 </span><span class="Special">% ZF = false;</span>
@@ -150,7 +150,7 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr"> 84 </span><span class="Normal">case</span> <span class="Constant">0x75</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 unless ZF</span>
 <span id="L85" class="LineNr"> 85 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">());</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L88" class="LineNr"> 88 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L89" class="LineNr"> 89 </span>  <span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -171,7 +171,7 @@ if ('onhashchange' in window) {
 <span id="L105" class="LineNr">105 </span><span class="SalientComment">//:: jump if greater</span>
 <span id="L106" class="LineNr">106 </span>
 <span id="L107" class="LineNr">107 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L108" class="LineNr">108 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if greater, if ZF is unset and SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jg/jnle)&quot;</span><span class="Delimiter">);</span>
+<span id="L108" class="LineNr">108 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if greater, if ZF is unset and SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jg/jnle)&quot;</span><span class="Delimiter">);</span>
 <span id="L109" class="LineNr">109 </span>
 <span id="L110" class="LineNr">110 </span><span class="Delimiter">:(scenario jg_rel8_success)</span>
 <span id="L111" class="LineNr">111 </span><span class="Special">% ZF = false;</span>
@@ -191,7 +191,7 @@ if ('onhashchange' in window) {
 <span id="L125" class="LineNr">125 </span><span class="Normal">case</span> <span class="Constant">0x7f</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if !SF and !ZF</span>
 <span id="L126" class="LineNr">126 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">());</span>
 <span id="L127" class="LineNr">127 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF &amp;&amp; SF == <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L128" class="LineNr">128 </span>    <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L128" class="LineNr">128 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L129" class="LineNr">129 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L130" class="LineNr">130 </span>  <span class="Delimiter">}</span>
 <span id="L131" class="LineNr">131 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -214,7 +214,7 @@ if ('onhashchange' in window) {
 <span id="L148" class="LineNr">148 </span><span class="SalientComment">//:: jump if greater or equal</span>
 <span id="L149" class="LineNr">149 </span>
 <span id="L150" class="LineNr">150 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L151" class="LineNr">151 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if greater or equal, if SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jge/jnl)&quot;</span><span class="Delimiter">);</span>
+<span id="L151" class="LineNr">151 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if greater or equal, if SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jge/jnl)&quot;</span><span class="Delimiter">);</span>
 <span id="L152" class="LineNr">152 </span>
 <span id="L153" class="LineNr">153 </span><span class="Delimiter">:(scenario jge_rel8_success)</span>
 <span id="L154" class="LineNr">154 </span><span class="Special">% SF = false;</span>
@@ -233,7 +233,7 @@ if ('onhashchange' in window) {
 <span id="L167" class="LineNr">167 </span><span class="Normal">case</span> <span class="Constant">0x7d</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if !SF</span>
 <span id="L168" class="LineNr">168 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">());</span>
 <span id="L169" class="LineNr">169 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF == <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L170" class="LineNr">170 </span>    <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L170" class="LineNr">170 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L171" class="LineNr">171 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L172" class="LineNr">172 </span>  <span class="Delimiter">}</span>
 <span id="L173" class="LineNr">173 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -255,7 +255,7 @@ if ('onhashchange' in window) {
 <span id="L189" class="LineNr">189 </span><span class="SalientComment">//:: jump if lesser</span>
 <span id="L190" class="LineNr">190 </span>
 <span id="L191" class="LineNr">191 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L192" class="LineNr">192 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if lesser, if SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jl/jnge)&quot;</span><span class="Delimiter">);</span>
+<span id="L192" class="LineNr">192 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if lesser, if SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jl/jnge)&quot;</span><span class="Delimiter">);</span>
 <span id="L193" class="LineNr">193 </span>
 <span id="L194" class="LineNr">194 </span><span class="Delimiter">:(scenario jl_rel8_success)</span>
 <span id="L195" class="LineNr">195 </span><span class="Special">% ZF = false;</span>
@@ -275,7 +275,7 @@ if ('onhashchange' in window) {
 <span id="L209" class="LineNr">209 </span><span class="Normal">case</span> <span class="Constant">0x7c</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if SF and !ZF</span>
 <span id="L210" class="LineNr">210 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">());</span>
 <span id="L211" class="LineNr">211 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF != <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L212" class="LineNr">212 </span>    <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L212" class="LineNr">212 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L213" class="LineNr">213 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L214" class="LineNr">214 </span>  <span class="Delimiter">}</span>
 <span id="L215" class="LineNr">215 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -298,7 +298,7 @@ if ('onhashchange' in window) {
 <span id="L232" class="LineNr">232 </span><span class="SalientComment">//:: jump if lesser or equal</span>
 <span id="L233" class="LineNr">233 </span>
 <span id="L234" class="LineNr">234 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L235" class="LineNr">235 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if lesser or equal, if ZF is set or SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jle/jng)&quot;</span><span class="Delimiter">);</span>
+<span id="L235" class="LineNr">235 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if lesser or equal, if ZF is set or SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jle/jng)&quot;</span><span class="Delimiter">);</span>
 <span id="L236" class="LineNr">236 </span>
 <span id="L237" class="LineNr">237 </span><span class="Delimiter">:(scenario jle_rel8_equal)</span>
 <span id="L238" class="LineNr">238 </span><span class="Special">% ZF = true;</span>
@@ -332,7 +332,7 @@ if ('onhashchange' in window) {
 <span id="L266" class="LineNr">266 </span><span class="Normal">case</span> <span class="Constant">0x7e</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if SF or ZF</span>
 <span id="L267" class="LineNr">267 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">());</span>
 <span id="L268" class="LineNr">268 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF || SF != <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L269" class="LineNr">269 </span>    <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L269" class="LineNr">269 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L270" class="LineNr">270 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L271" class="LineNr">271 </span>  <span class="Delimiter">}</span>
 <span id="L272" class="LineNr">272 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/subx/018jump_disp32.cc.html b/html/subx/018jump_disp32.cc.html
index cb829dc6..9b1e6a95 100644
--- a/html/subx/018jump_disp32.cc.html
+++ b/html/subx/018jump_disp32.cc.html
@@ -69,7 +69,7 @@ if ('onhashchange' in window) {
 <span id="L3" class="LineNr">  3 </span><span class="SalientComment">//:: jump</span>
 <span id="L4" class="LineNr">  4 </span>
 <span id="L5" class="LineNr">  5 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L6" class="LineNr">  6 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away (jmp)&quot;</span><span class="Delimiter">);</span>
+<span id="L6" class="LineNr">  6 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away (jmp)&quot;</span><span class="Delimiter">);</span>
 <span id="L7" class="LineNr">  7 </span>
 <span id="L8" class="LineNr">  8 </span><span class="Delimiter">:(scenario jump_disp32)</span>
 <span id="L9" class="LineNr">  9 </span>== <span class="Constant">0x1</span>
@@ -85,7 +85,7 @@ if ('onhashchange' in window) {
 <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L20" class="LineNr"> 20 </span><span class="Normal">case</span> <span class="Constant">0xe9</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; offset &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; offset &lt;&lt; end<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>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L25" class="LineNr"> 25 </span><span class="Delimiter">}</span>
@@ -93,7 +93,7 @@ if ('onhashchange' in window) {
 <span id="L27" class="LineNr"> 27 </span><span class="SalientComment">//:: jump if equal/zero</span>
 <span id="L28" class="LineNr"> 28 </span>
 <span id="L29" class="LineNr"> 29 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L30" class="LineNr"> 30 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if equal, if ZF is set (jcc/jz/je)&quot;</span><span class="Delimiter">);</span>
+<span id="L30" class="LineNr"> 30 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if equal, if ZF is set (jcc/jz/je)&quot;</span><span class="Delimiter">);</span>
 <span id="L31" class="LineNr"> 31 </span>
 <span id="L32" class="LineNr"> 32 </span><span class="Delimiter">:(scenario je_disp32_success)</span>
 <span id="L33" class="LineNr"> 33 </span><span class="Special">% ZF = true;</span>
@@ -111,7 +111,7 @@ if ('onhashchange' in window) {
 <span id="L45" class="LineNr"> 45 </span><span class="Normal">case</span> <span class="Constant">0x84</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 if ZF</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L48" class="LineNr"> 48 </span>    <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L48" class="LineNr"> 48 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L49" class="LineNr"> 49 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L50" class="LineNr"> 50 </span>  <span class="Delimiter">}</span>
 <span id="L51" class="LineNr"> 51 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -132,7 +132,7 @@ if ('onhashchange' in window) {
 <span id="L66" class="LineNr"> 66 </span><span class="SalientComment">//:: jump if not equal/not zero</span>
 <span id="L67" class="LineNr"> 67 </span>
 <span id="L68" class="LineNr"> 68 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L69" class="LineNr"> 69 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if not equal, if ZF is not set (jcc/jnz/jne)&quot;</span><span class="Delimiter">);</span>
+<span id="L69" class="LineNr"> 69 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if not equal, if ZF is not set (jcc/jnz/jne)&quot;</span><span class="Delimiter">);</span>
 <span id="L70" class="LineNr"> 70 </span>
 <span id="L71" class="LineNr"> 71 </span><span class="Delimiter">:(scenario jne_disp32_success)</span>
 <span id="L72" class="LineNr"> 72 </span><span class="Special">% ZF = false;</span>
@@ -150,7 +150,7 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr"> 84 </span><span class="Normal">case</span> <span class="Constant">0x85</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 unless ZF</span>
 <span id="L85" class="LineNr"> 85 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L88" class="LineNr"> 88 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L89" class="LineNr"> 89 </span>  <span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -171,7 +171,7 @@ if ('onhashchange' in window) {
 <span id="L105" class="LineNr">105 </span><span class="SalientComment">//:: jump if greater</span>
 <span id="L106" class="LineNr">106 </span>
 <span id="L107" class="LineNr">107 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L108" class="LineNr">108 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if greater, if ZF is unset and SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jg/jnle)&quot;</span><span class="Delimiter">);</span>
+<span id="L108" class="LineNr">108 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if greater, if ZF is unset and SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jg/jnle)&quot;</span><span class="Delimiter">);</span>
 <span id="L109" class="LineNr">109 </span>
 <span id="L110" class="LineNr">110 </span><span class="Delimiter">:(scenario jg_disp32_success)</span>
 <span id="L111" class="LineNr">111 </span><span class="Special">% ZF = false;</span>
@@ -191,7 +191,7 @@ if ('onhashchange' in window) {
 <span id="L125" class="LineNr">125 </span><span class="Normal">case</span> <span class="Constant">0x8f</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 if !SF and !ZF</span>
 <span id="L126" class="LineNr">126 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
 <span id="L127" class="LineNr">127 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF &amp;&amp; SF == <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L128" class="LineNr">128 </span>    <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L128" class="LineNr">128 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L129" class="LineNr">129 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L130" class="LineNr">130 </span>  <span class="Delimiter">}</span>
 <span id="L131" class="LineNr">131 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -214,7 +214,7 @@ if ('onhashchange' in window) {
 <span id="L148" class="LineNr">148 </span><span class="SalientComment">//:: jump if greater or equal</span>
 <span id="L149" class="LineNr">149 </span>
 <span id="L150" class="LineNr">150 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L151" class="LineNr">151 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if greater or equal, if SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jge/jnl)&quot;</span><span class="Delimiter">);</span>
+<span id="L151" class="LineNr">151 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if greater or equal, if SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jge/jnl)&quot;</span><span class="Delimiter">);</span>
 <span id="L152" class="LineNr">152 </span>
 <span id="L153" class="LineNr">153 </span><span class="Delimiter">:(scenario jge_disp32_success)</span>
 <span id="L154" class="LineNr">154 </span><span class="Special">% SF = false;</span>
@@ -233,7 +233,7 @@ if ('onhashchange' in window) {
 <span id="L167" class="LineNr">167 </span><span class="Normal">case</span> <span class="Constant">0x8d</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 if !SF</span>
 <span id="L168" class="LineNr">168 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
 <span id="L169" class="LineNr">169 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF == <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L170" class="LineNr">170 </span>    <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L170" class="LineNr">170 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L171" class="LineNr">171 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L172" class="LineNr">172 </span>  <span class="Delimiter">}</span>
 <span id="L173" class="LineNr">173 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -255,7 +255,7 @@ if ('onhashchange' in window) {
 <span id="L189" class="LineNr">189 </span><span class="SalientComment">//:: jump if lesser</span>
 <span id="L190" class="LineNr">190 </span>
 <span id="L191" class="LineNr">191 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L192" class="LineNr">192 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if lesser, if SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jl/jnge)&quot;</span><span class="Delimiter">);</span>
+<span id="L192" class="LineNr">192 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if lesser, if SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jl/jnge)&quot;</span><span class="Delimiter">);</span>
 <span id="L193" class="LineNr">193 </span>
 <span id="L194" class="LineNr">194 </span><span class="Delimiter">:(scenario jl_disp32_success)</span>
 <span id="L195" class="LineNr">195 </span><span class="Special">% ZF = false;</span>
@@ -275,7 +275,7 @@ if ('onhashchange' in window) {
 <span id="L209" class="LineNr">209 </span><span class="Normal">case</span> <span class="Constant">0x8c</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 if SF and !ZF</span>
 <span id="L210" class="LineNr">210 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
 <span id="L211" class="LineNr">211 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF != <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L212" class="LineNr">212 </span>    <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L212" class="LineNr">212 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L213" class="LineNr">213 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L214" class="LineNr">214 </span>  <span class="Delimiter">}</span>
 <span id="L215" class="LineNr">215 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -298,7 +298,7 @@ if ('onhashchange' in window) {
 <span id="L232" class="LineNr">232 </span><span class="SalientComment">//:: jump if lesser or equal</span>
 <span id="L233" class="LineNr">233 </span>
 <span id="L234" class="LineNr">234 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L235" class="LineNr">235 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if lesser or equal, if ZF is set or SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jle/jng)&quot;</span><span class="Delimiter">);</span>
+<span id="L235" class="LineNr">235 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp32 bytes away if lesser or equal, if ZF is set or SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jle/jng)&quot;</span><span class="Delimiter">);</span>
 <span id="L236" class="LineNr">236 </span>
 <span id="L237" class="LineNr">237 </span><span class="Delimiter">:(scenario jle_disp32_equal)</span>
 <span id="L238" class="LineNr">238 </span><span class="Special">% ZF = true;</span>
@@ -332,7 +332,7 @@ if ('onhashchange' in window) {
 <span id="L266" class="LineNr">266 </span><span class="Normal">case</span> <span class="Constant">0x8e</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump disp32 if SF or ZF</span>
 <span id="L267" class="LineNr">267 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
 <span id="L268" class="LineNr">268 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF || SF != <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L269" class="LineNr">269 </span>    <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L269" class="LineNr">269 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L270" class="LineNr">270 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L271" class="LineNr">271 </span>  <span class="Delimiter">}</span>
 <span id="L272" class="LineNr">272 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/subx/019functions.cc.html b/html/subx/019functions.cc.html
index ba6c25b6..a9143ecb 100644
--- a/html/subx/019functions.cc.html
+++ b/html/subx/019functions.cc.html
@@ -67,7 +67,7 @@ if ('onhashchange' in window) {
 <span id="L1" class="LineNr"> 1 </span><span class="SalientComment">//:: call</span>
 <span id="L2" class="LineNr"> 2 </span>
 <span id="L3" class="LineNr"> 3 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L4" class="LineNr"> 4 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;call disp32 (call)&quot;</span><span class="Delimiter">);</span>
+<span id="L4" class="LineNr"> 4 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;call disp32 (call)&quot;</span><span class="Delimiter">);</span>
 <span id="L5" class="LineNr"> 5 </span>
 <span id="L6" class="LineNr"> 6 </span><span class="Delimiter">:(scenario call_disp32)</span>
 <span id="L7" class="LineNr"> 7 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
@@ -83,11 +83,11 @@ if ('onhashchange' in window) {
 <span id="L17" class="LineNr">17 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L18" class="LineNr">18 </span><span class="Normal">case</span> <span class="Constant">0xe8</span>: <span class="Delimiter">{</span>  <span class="Comment">// call disp32 relative to next EIP</span>
 <span id="L19" class="LineNr">19 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L20" class="LineNr">20 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; offset &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L20" class="LineNr">20 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; offset &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L21" class="LineNr">21 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: EIP: &quot; &lt;&lt; EIP &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
 <span id="L22" class="LineNr">22 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
 <span id="L23" class="LineNr">23 </span>  <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L24" class="LineNr">24 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L24" class="LineNr">24 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L25" class="LineNr">25 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L26" class="LineNr">26 </span><span class="Delimiter">}</span>
 <span id="L27" class="LineNr">27 </span>
@@ -108,11 +108,11 @@ if ('onhashchange' in window) {
 <span id="L42" class="LineNr">42 </span>
 <span id="L43" class="LineNr">43 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
 <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#L203'>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; end<span class="Delimiter">();</span>
+<span id="L45" class="LineNr">45 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L46" class="LineNr">46 </span>  <span class="Normal">const</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#L89'>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#L203'>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#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L49" class="LineNr">49 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L50" class="LineNr">50 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L51" class="LineNr">51 </span><span class="Delimiter">}</span>
 <span id="L52" class="LineNr">52 </span>
@@ -134,7 +134,7 @@ if ('onhashchange' in window) {
 <span id="L68" class="LineNr">68 </span><span class="SalientComment">//:: ret</span>
 <span id="L69" class="LineNr">69 </span>
 <span id="L70" class="LineNr">70 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L71" class="LineNr">71 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;return from most recent unfinished call (ret)&quot;</span><span class="Delimiter">);</span>
+<span id="L71" class="LineNr">71 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;return from most recent unfinished call (ret)&quot;</span><span class="Delimiter">);</span>
 <span id="L72" class="LineNr">72 </span>
 <span id="L73" class="LineNr">73 </span><span class="Delimiter">:(scenario ret)</span>
 <span id="L74" class="LineNr">74 </span><span class="Special">% Reg[ESP].u = 0x2000;</span>
@@ -149,9 +149,9 @@ if ('onhashchange' in window) {
 <span id="L83" class="LineNr">83 </span>
 <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#L203'>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; end<span class="Delimiter">();</span>
+<span id="L86" class="LineNr">86 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;return&quot;</span> &lt;&lt; end<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#L788'>pop</a><span class="Delimiter">();</span>
-<span id="L88" class="LineNr">88 </span>  <a href='003trace.cc.html#L203'>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#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L88" class="LineNr">88 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<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>
 </pre>
diff --git a/html/subx/020syscalls.cc.html b/html/subx/020syscalls.cc.html
index 32b7580a..0313f5c3 100644
--- a/html/subx/020syscalls.cc.html
+++ b/html/subx/020syscalls.cc.html
@@ -63,15 +63,15 @@ if ('onhashchange' in window) {
 <a href='https://github.com/akkartik/mu/blob/master/subx/020syscalls.cc'>https://github.com/akkartik/mu/blob/master/subx/020syscalls.cc</a>
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr">  1 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L2" class="LineNr">  2 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;cd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;software interrupt (int)&quot;</span><span class="Delimiter">);</span>
+<span id="L2" class="LineNr">  2 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;cd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;software interrupt (int)&quot;</span><span class="Delimiter">);</span>
 <span id="L3" class="LineNr">  3 </span>
 <span id="L4" class="LineNr">  4 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L5" class="LineNr">  5 </span><span class="Normal">case</span> <span class="Constant">0xcd</span>: <span class="Delimiter">{</span>  <span class="Comment">// int imm8 (software interrupt)</span>
-<span id="L6" class="LineNr">  6 </span>  <a href='003trace.cc.html#L203'>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;syscall&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L6" class="LineNr">  6 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;syscall&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L7" class="LineNr">  7 </span>  <span class="Normal">uint8_t</span> <a href='031check_operands.cc.html#L11'>code</a> = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L8" class="LineNr">  8 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a> != <span class="Constant">0x80</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L9" class="LineNr">  9 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;Unimplemented interrupt <a href='031check_operands.cc.html#L11'>code</a> &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L412'>HEXBYTE</a> &lt;&lt; <a href='031check_operands.cc.html#L11'>code</a> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L10" class="LineNr"> 10 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;  Only `int 80h` supported for now.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L9" class="LineNr">  9 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;Unimplemented interrupt <a href='031check_operands.cc.html#L11'>code</a> &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L412'>HEXBYTE</a> &lt;&lt; <a href='031check_operands.cc.html#L11'>code</a> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L10" class="LineNr"> 10 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;  Only `int 80h` supported for now.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L11" class="LineNr"> 11 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L12" class="LineNr"> 12 </span>  <span class="Delimiter">}</span>
 <span id="L13" class="LineNr"> 13 </span>  <a href='020syscalls.cc.html#L18'>process_int80</a><span class="Delimiter">();</span>
@@ -85,70 +85,70 @@ if ('onhashchange' in window) {
 <span id="L21" class="LineNr"> 21 </span>    exit<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">exit <a href='031check_operands.cc.html#L11'>code</a></span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L22" class="LineNr"> 22 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Normal">case</span> <span class="Constant">3</span>:
-<span id="L24" class="LineNr"> 24 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;read: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L24" class="LineNr"> 24 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;read: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L25" class="LineNr"> 25 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = read<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">file descriptor</span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">memory buffer</span><span class="Comment">*/</span><a href='010---vm.cc.html#L217'>mem_addr_u8</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">size</span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L26" class="LineNr"> 26 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L27" class="LineNr"> 27 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L26" class="LineNr"> 26 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L27" class="LineNr"> 27 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<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="Normal">case</span> <span class="Constant">4</span>:
-<span id="L30" class="LineNr"> 30 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;write: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L31" class="LineNr"> 31 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L255'>mem_addr_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L30" class="LineNr"> 30 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;write: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L31" class="LineNr"> 31 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L255'>mem_addr_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L32" class="LineNr"> 32 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = write<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">file descriptor</span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">memory buffer</span><span class="Comment">*/</span><a href='010---vm.cc.html#L217'>mem_addr_u8</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">size</span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L33" class="LineNr"> 33 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L34" class="LineNr"> 34 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L33" class="LineNr"> 33 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L34" class="LineNr"> 34 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L35" class="LineNr"> 35 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L36" class="LineNr"> 36 </span>  <span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>
 <span id="L37" class="LineNr"> 37 </span>    <a href='020syscalls.cc.html#L93'>check_flags</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L14'>ECX</a><span class="Delimiter">);</span>
 <span id="L38" class="LineNr"> 38 </span>    <a href='020syscalls.cc.html#L105'>check_mode</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L15'>EDX</a><span class="Delimiter">);</span>
-<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;open: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;open: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L41" class="LineNr"> 41 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = open<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">filename</span><span class="Comment">*/</span><a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">flags</span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">mode</span><span class="Comment">*/</span><span class="PreProc">0</span><span class="Constant">640</span><span class="Delimiter">);</span>
-<span id="L42" class="LineNr"> 42 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L43" class="LineNr"> 43 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L42" class="LineNr"> 42 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L43" class="LineNr"> 43 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L44" class="LineNr"> 44 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Delimiter">}</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Normal">case</span> <span class="Constant">6</span>:
-<span id="L47" class="LineNr"> 47 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;close: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L47" class="LineNr"> 47 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;close: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L48" class="LineNr"> 48 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = close<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">file descriptor</span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L49" class="LineNr"> 49 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L50" class="LineNr"> 50 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L49" class="LineNr"> 49 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L50" class="LineNr"> 50 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L51" class="LineNr"> 51 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L52" class="LineNr"> 52 </span>  <span class="Normal">case</span> <span class="Constant">8</span>:
 <span id="L53" class="LineNr"> 53 </span>    <a href='020syscalls.cc.html#L105'>check_mode</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L14'>ECX</a><span class="Delimiter">);</span>
-<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;creat: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L55" class="LineNr"> 55 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;creat: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L55" class="LineNr"> 55 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L56" class="LineNr"> 56 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = creat<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">filename</span><span class="Comment">*/</span><a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">mode</span><span class="Comment">*/</span><span class="PreProc">0</span><span class="Constant">640</span><span class="Delimiter">);</span>
-<span id="L57" class="LineNr"> 57 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L58" class="LineNr"> 58 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L57" class="LineNr"> 57 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L58" class="LineNr"> 58 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L59" class="LineNr"> 59 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L60" class="LineNr"> 60 </span>  <span class="Normal">case</span> <span class="Constant">10</span>:
-<span id="L61" class="LineNr"> 61 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unlink: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L62" class="LineNr"> 62 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L61" class="LineNr"> 61 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unlink: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L62" class="LineNr"> 62 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L63" class="LineNr"> 63 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = unlink<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">filename</span><span class="Comment">*/</span><a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">));</span>
-<span id="L64" class="LineNr"> 64 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L65" class="LineNr"> 65 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L64" class="LineNr"> 64 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L65" class="LineNr"> 65 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L66" class="LineNr"> 66 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L67" class="LineNr"> 67 </span>  <span class="Normal">case</span> <span class="Constant">38</span>:
-<span id="L68" class="LineNr"> 68 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;rename: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L69" class="LineNr"> 69 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L70" class="LineNr"> 70 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L68" class="LineNr"> 68 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;rename: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L69" class="LineNr"> 69 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L70" class="LineNr"> 70 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L71" class="LineNr"> 71 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i = rename<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">old filename</span><span class="Comment">*/</span><a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">new filename</span><span class="Comment">*/</span><a href='010---vm.cc.html#L252'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">));</span>
-<span id="L72" class="LineNr"> 72 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L73" class="LineNr"> 73 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L72" class="LineNr"> 72 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L73" class="LineNr"> 73 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L74" class="LineNr"> 74 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L75" class="LineNr"> 75 </span>  <span class="Normal">case</span> <span class="Constant">45</span>:  <span class="Comment">// brk: modify size of data segment</span>
-<span id="L76" class="LineNr"> 76 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;grow data segment to &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L76" class="LineNr"> 76 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;grow data segment to &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L77" class="LineNr"> 77 </span>    <a href='010---vm.cc.html#L189'>grow_data_segment</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">new end address</span><span class="Comment">*/</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L78" class="LineNr"> 78 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L79" class="LineNr"> 79 </span>  <span class="Normal">case</span> <span class="Constant">90</span>:  <span class="Comment">// mmap: allocate memory outside existing segment allocations</span>
-<span id="L80" class="LineNr"> 80 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;mmap: allocate new segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L80" class="LineNr"> 80 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;mmap: allocate new segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L81" class="LineNr"> 81 </span>    <span class="Comment">// Ignore most arguments for now: address hint, protection flags, sharing flags, fd, offset.</span>
 <span id="L82" class="LineNr"> 82 </span>    <span class="Comment">// We only support anonymous maps.</span>
 <span id="L83" class="LineNr"> 83 </span>    <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u = <a href='020syscalls.cc.html#L116'>new_segment</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">length</span><span class="Comment">*/</span><a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EBX]<span class="Delimiter">.</span>u+<span class="Constant">0x4</span><span class="Delimiter">));</span>
-<span id="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L85" class="LineNr"> 85 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Normal">default</span>:
-<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: unimplemented syscall &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: unimplemented syscall &quot;</span> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>u &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L88" class="LineNr"> 88 </span>  <span class="Delimiter">}</span>
 <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span>
diff --git a/html/subx/021byte_addressing.cc.html b/html/subx/021byte_addressing.cc.html
index e339fd4f..4ae685a0 100644
--- a/html/subx/021byte_addressing.cc.html
+++ b/html/subx/021byte_addressing.cc.html
@@ -78,7 +78,7 @@ if ('onhashchange' in window) {
 <span id="L14" class="LineNr"> 14 </span>  <span class="Normal">case</span> <span class="Constant">5</span>: <span class="Identifier">return</span> <span class="Constant">&quot;CH&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// second lowest byte of ECX</span>
 <span id="L15" class="LineNr"> 15 </span>  <span class="Normal">case</span> <span class="Constant">6</span>: <span class="Identifier">return</span> <span class="Constant">&quot;DH&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// second lowest byte of EDX</span>
 <span id="L16" class="LineNr"> 16 </span>  <span class="Normal">case</span> <span class="Constant">7</span>: <span class="Identifier">return</span> <span class="Constant">&quot;BH&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// second lowest byte of EBX</span>
-<span id="L17" class="LineNr"> 17 </span>  <span class="Normal">default</span>: <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid 8-bit register &quot;</span> &lt;&lt; r &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>  <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L17" class="LineNr"> 17 </span>  <span class="Normal">default</span>: <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid 8-bit register &quot;</span> &lt;&lt; r &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>  <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
 <span id="L18" class="LineNr"> 18 </span>  <span class="Delimiter">}</span>
 <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">}</span>
 <span id="L20" class="LineNr"> 20 </span>
@@ -87,7 +87,7 @@ if ('onhashchange' in window) {
 <span id="L23" class="LineNr"> 23 </span>  <span class="Normal">uint8_t</span> rm = modrm &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mod == <span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L25" class="LineNr"> 25 </span>    <span class="Comment">// select an 8-bit register</span>
-<span id="L26" class="LineNr"> 26 </span>    <a href='003trace.cc.html#L203'>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;r/m8 is &quot;</span> &lt;&lt; <a href='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L26" class="LineNr"> 26 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;r/m8 is &quot;</span> &lt;&lt; <a href='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L27" class="LineNr"> 27 </span>    <span class="Identifier">return</span> <a href='021byte_addressing.cc.html#L33'>reg_8bit</a><span class="Delimiter">(</span>rm<span class="Delimiter">);</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Delimiter">}</span>
 <span id="L29" class="LineNr"> 29 </span>  <span class="Comment">// the rest is as usual</span>
@@ -102,7 +102,7 @@ if ('onhashchange' in window) {
 <span id="L38" class="LineNr"> 38 </span><span class="Delimiter">}</span>
 <span id="L39" class="LineNr"> 39 </span>
 <span id="L40" class="LineNr"> 40 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L41" class="LineNr"> 41 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;88&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r8 to r8/m8-at-r32&quot;</span><span class="Delimiter">);</span>
+<span id="L41" class="LineNr"> 41 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;88&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r8 to r8/m8-at-r32&quot;</span><span class="Delimiter">);</span>
 <span id="L42" class="LineNr"> 42 </span>
 <span id="L43" class="LineNr"> 43 </span><span class="Delimiter">:(scenario copy_r8_to_mem_at_r32)</span>
 <span id="L44" class="LineNr"> 44 </span><span class="Special">% Reg[EBX].i = 0x224488ab;</span>
@@ -122,19 +122,19 @@ if ('onhashchange' in window) {
 <span id="L58" class="LineNr"> 58 </span><span class="Normal">case</span> <span class="Constant">0x88</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r8 to r/m8</span>
 <span id="L59" class="LineNr"> 59 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L60" class="LineNr"> 60 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rsrc = <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="L61" class="LineNr"> 61 </span>  <a href='003trace.cc.html#L203'>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='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r8/m8-at-r32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L61" class="LineNr"> 61 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy &quot;</span> &lt;&lt; <a href='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r8/m8-at-r32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L62" class="LineNr"> 62 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
 <span id="L63" class="LineNr"> 63 </span>  <span class="Normal">uint8_t</span>* dest = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='021byte_addressing.cc.html#L21'>effective_byte_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
 <span id="L64" class="LineNr"> 64 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span>* src = <a href='021byte_addressing.cc.html#L33'>reg_8bit</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">);</span>
 <span id="L65" class="LineNr"> 65 </span>  *dest = *src<span class="Delimiter">;</span>
-<span id="L66" class="LineNr"> 66 </span>  <a href='003trace.cc.html#L203'>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#L412'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>*dest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L66" class="LineNr"> 66 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L412'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>*dest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L67" class="LineNr"> 67 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L68" class="LineNr"> 68 </span><span class="Delimiter">}</span>
 <span id="L69" class="LineNr"> 69 </span>
 <span id="L70" class="LineNr"> 70 </span><span class="Comment">//:</span>
 <span id="L71" class="LineNr"> 71 </span>
 <span id="L72" class="LineNr"> 72 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L73" class="LineNr"> 73 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r8/m8-at-r32 to r8&quot;</span><span class="Delimiter">);</span>
+<span id="L73" class="LineNr"> 73 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r8/m8-at-r32 to r8&quot;</span><span class="Delimiter">);</span>
 <span id="L74" class="LineNr"> 74 </span>
 <span id="L75" class="LineNr"> 75 </span><span class="Delimiter">:(scenario copy_mem_at_r32_to_r8)</span>
 <span id="L76" class="LineNr"> 76 </span><span class="Special">% Reg[EBX].i = 0xaabbcc0f;  // one nibble each of lowest byte set to all 0s and all 1s, to maximize value of this test</span>
@@ -155,14 +155,14 @@ if ('onhashchange' in window) {
 <span id="L91" class="LineNr"> 91 </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="L92" class="LineNr"> 92 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L93" class="LineNr"> 93 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest = <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="L94" class="LineNr"> 94 </span>  <a href='003trace.cc.html#L203'>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 &quot;</span> &lt;&lt; <a href='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L94" class="LineNr"> 94 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy r8/m8-at-r32 to &quot;</span> &lt;&lt; <a href='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L95" class="LineNr"> 95 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span>* src = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='021byte_addressing.cc.html#L21'>effective_byte_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
 <span id="L97" class="LineNr"> 97 </span>  <span class="Normal">uint8_t</span>* dest = <a href='021byte_addressing.cc.html#L33'>reg_8bit</a><span class="Delimiter">(</span>rdest<span class="Delimiter">);</span>
-<span id="L98" class="LineNr"> 98 </span>  <a href='003trace.cc.html#L203'>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#L412'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>*src<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L98" class="LineNr"> 98 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L412'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>*src<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L99" class="LineNr"> 99 </span>  *dest = *src<span class="Delimiter">;</span>
 <span id="L100" class="LineNr">100 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest_32bit = rdest &amp; <span class="Constant">0x3</span><span class="Delimiter">;</span>
-<span id="L101" class="LineNr">101 </span>  <a href='003trace.cc.html#L203'>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; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rdest_32bit<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; now contains 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rdest_32bit]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L101" class="LineNr">101 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rdest_32bit<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; now contains 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rdest_32bit]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L102" class="LineNr">102 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L103" class="LineNr">103 </span><span class="Delimiter">}</span>
 <span id="L104" class="LineNr">104 </span>
diff --git a/html/subx/028translate.cc.html b/html/subx/028translate.cc.html
index 67a910de..5b727ba7 100644
--- a/html/subx/028translate.cc.html
+++ b/html/subx/028translate.cc.html
@@ -81,14 +81,14 @@ if ('onhashchange' in window) {
 <span id="L17" class="LineNr"> 17 </span><span class="Comment">//: Higher levels usually transform code on the basis of metadata.</span>
 <span id="L18" class="LineNr"> 18 </span>
 <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Main&quot;)</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;translate&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L252'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;translate&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L228'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span>
 <span id="L22" class="LineNr"> 22 </span>  <a href='000organization.cc.html#L148'>reset</a><span class="Delimiter">();</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Comment">// Begin subx translate</span>
 <span id="L24" class="LineNr"> 24 </span>  <a href='011run.cc.html#L99'>program</a> p<span class="Delimiter">;</span>
 <span id="L25" class="LineNr"> 25 </span>  string output_filename<span class="Delimiter">;</span>
 <span id="L26" class="LineNr"> 26 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip 'subx translate'</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">;</span>  i &lt; argc<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L27" class="LineNr"> 27 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>argv[i]<span class="Delimiter">,</span> <span class="Constant">&quot;-o&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L27" class="LineNr"> 27 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>argv[i]<span class="Delimiter">,</span> <span class="Constant">&quot;-o&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L28" class="LineNr"> 28 </span>      ++i<span class="Delimiter">;</span>
 <span id="L29" class="LineNr"> 29 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt;= argc<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L30" class="LineNr"> 30 </span>        <a href='028translate.cc.html#L68'>print_translate_usage</a><span class="Delimiter">();</span>
@@ -104,7 +104,7 @@ if ('onhashchange' in window) {
 <span id="L40" class="LineNr"> 40 </span>        <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L41" class="LineNr"> 41 </span>      <span class="Delimiter">}</span>
 <span id="L42" class="LineNr"> 42 </span>      parse<span class="Delimiter">(</span>fin<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L43" class="LineNr"> 43 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L43" class="LineNr"> 43 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L44" class="LineNr"> 44 </span>    <span class="Delimiter">}</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Delimiter">}</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
@@ -118,9 +118,9 @@ if ('onhashchange' in window) {
 <span id="L54" class="LineNr"> 54 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L55" class="LineNr"> 55 </span>  <span class="Delimiter">}</span>
 <span id="L56" class="LineNr"> 56 </span>  <a href='011run.cc.html#L231'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L57" class="LineNr"> 57 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L58" class="LineNr"> 58 </span>  <a href='028translate.cc.html#L73'>save_elf</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> output_filename<span class="Delimiter">);</span>
-<span id="L59" class="LineNr"> 59 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L60" class="LineNr"> 60 </span>    unlink<span class="Delimiter">(</span>output_filename<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
 <span id="L61" class="LineNr"> 61 </span>    <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L62" class="LineNr"> 62 </span>  <span class="Delimiter">}</span>
@@ -178,7 +178,7 @@ if ('onhashchange' in window) {
 <span id="L114" class="LineNr">114 </span>  <span class="Normal">uint16_t</span> e_phentsize = <span class="Constant">0x20</span><span class="Delimiter">;</span>
 <span id="L115" class="LineNr">115 </span>  emit<span class="Delimiter">(</span>e_phentsize<span class="Delimiter">);</span>
 <span id="L116" class="LineNr">116 </span>  <span class="Comment">// e_phnum</span>
-<span id="L117" class="LineNr">117 </span>  <span class="Normal">uint16_t</span> e_phnum = <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>
+<span id="L117" class="LineNr">117 </span>  <span class="Normal">uint16_t</span> e_phnum = <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>
 <span id="L118" class="LineNr">118 </span>  emit<span class="Delimiter">(</span>e_phnum<span class="Delimiter">);</span>
 <span id="L119" class="LineNr">119 </span>  <span class="Comment">// e_shentsize</span>
 <span id="L120" class="LineNr">120 </span>  <span class="Normal">uint16_t</span> dummy16 = <span class="Constant">0x0</span><span class="Delimiter">;</span>
@@ -188,8 +188,8 @@ if ('onhashchange' in window) {
 <span id="L124" class="LineNr">124 </span>  <span class="Comment">// e_shstrndx</span>
 <span id="L125" class="LineNr">125 </span>  emit<span class="Delimiter">(</span>dummy16<span class="Delimiter">);</span>
 <span id="L126" class="LineNr">126 </span>
-<span id="L127" class="LineNr">127 </span>  <span class="Normal">uint32_t</span> p_offset = <span class="Comment">/*</span><span class="Comment">size of ehdr</span><span class="Comment">*/</span><span class="Constant">0x34</span> + <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">)</span>*<span class="Constant">0x20</span><span class="Comment">/*</span><span class="Comment">size of each phdr</span><span class="Comment">*/</span><span class="Delimiter">;</span>
-<span id="L128" class="LineNr">128 </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>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L127" class="LineNr">127 </span>  <span class="Normal">uint32_t</span> p_offset = <span class="Comment">/*</span><span class="Comment">size of ehdr</span><span class="Comment">*/</span><span class="Constant">0x34</span> + <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">)</span>*<span class="Constant">0x20</span><span class="Comment">/*</span><span class="Comment">size of each phdr</span><span class="Comment">*/</span><span class="Delimiter">;</span>
+<span id="L128" class="LineNr">128 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L129" class="LineNr">129 </span>    <span class="SalientComment">//// phdr</span>
 <span id="L130" class="LineNr">130 </span>    <span class="Comment">// p_type</span>
 <span id="L131" class="LineNr">131 </span>    <span class="Normal">uint32_t</span> p_type = <span class="Constant">0x1</span><span class="Delimiter">;</span>
@@ -225,7 +225,7 @@ if ('onhashchange' in window) {
 <span id="L161" class="LineNr">161 </span>    <span class="Normal">uint32_t</span> p_align = <span class="Constant">0x1000</span><span class="Delimiter">;</span>  <span class="Comment">// default page size on linux</span>
 <span id="L162" class="LineNr">162 </span>    emit<span class="Delimiter">(</span>p_align<span class="Delimiter">);</span>
 <span id="L163" class="LineNr">163 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p_offset % p_align != p_start % p_align<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L164" class="LineNr">164 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;segment starting at 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; p_start &lt;&lt; <span class="Constant">&quot; is improperly aligned; alignment for p_offset &quot;</span> &lt;&lt; p_offset &lt;&lt; <span class="Constant">&quot; should be &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_offset % p_align<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but is &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_start % p_align<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L164" class="LineNr">164 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;segment starting at 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; p_start &lt;&lt; <span class="Constant">&quot; is improperly aligned; alignment for p_offset &quot;</span> &lt;&lt; p_offset &lt;&lt; <span class="Constant">&quot; should be &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_offset % p_align<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but is &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_start % p_align<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L165" class="LineNr">165 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L166" class="LineNr">166 </span>    <span class="Delimiter">}</span>
 <span id="L167" class="LineNr">167 </span>
@@ -237,9 +237,9 @@ if ('onhashchange' in window) {
 <span id="L173" class="LineNr">173 </span><span class="Delimiter">}</span>
 <span id="L174" class="LineNr">174 </span>
 <span id="L175" class="LineNr">175 </span><span class="Normal">void</span> <a href='028translate.cc.html#L175'>write_segment</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L176" class="LineNr">176 </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>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L176" class="LineNr">176 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L177" class="LineNr">177 </span>    <span class="Normal">const</span> vector&lt;word&gt;&amp; w = s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">;</span>
-<span id="L178" class="LineNr">178 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L178" class="LineNr">178 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L179" class="LineNr">179 </span>      <span class="Normal">uint8_t</span> x = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">).</span>data<span class="Delimiter">);</span>  <span class="Comment">// we're done with metadata by this point</span>
 <span id="L180" class="LineNr">180 </span>      out<span class="Delimiter">.</span>write<span class="Delimiter">(</span><span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">const</span> <span class="Normal">char</span>*&gt;<span class="Delimiter">(</span>&amp;x<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">sizeof(byte)</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L181" class="LineNr">181 </span>    <span class="Delimiter">}</span>
@@ -248,8 +248,8 @@ if ('onhashchange' in window) {
 <span id="L184" class="LineNr">184 </span>
 <span id="L185" class="LineNr">185 </span><span class="Normal">uint32_t</span> <a href='028translate.cc.html#L185'>num_words</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L186" class="LineNr">186 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L187" class="LineNr">187 </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>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L188" class="LineNr">188 </span>    sum += <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L188" class="LineNr">188 </span>    sum += <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
 <span id="L189" class="LineNr">189 </span>  <span class="Identifier">return</span> sum<span class="Delimiter">;</span>
 <span id="L190" class="LineNr">190 </span><span class="Delimiter">}</span>
 <span id="L191" class="LineNr">191 </span>
diff --git a/html/subx/030---operands.cc.html b/html/subx/030---operands.cc.html
index ad4ef9c1..25f176ce 100644
--- a/html/subx/030---operands.cc.html
+++ b/html/subx/030---operands.cc.html
@@ -77,7 +77,7 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr"> 13 </span><span class="Comment">//: pack and order the bytes corresponding to the operands in an instruction.</span>
 <span id="L14" class="LineNr"> 14 </span>
 <span id="L15" class="LineNr"> 15 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Texts&quot;)</span>
-<span id="L16" class="LineNr"> 16 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;instructions&quot;</span><span class="Delimiter">,</span>
+<span id="L16" class="LineNr"> 16 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;instructions&quot;</span><span class="Delimiter">,</span>
 <span id="L17" class="LineNr"> 17 </span>  <span class="Constant">&quot;Each x86 instruction consists of an instruction or opcode and some number\n&quot;</span>
 <span id="L18" class="LineNr"> 18 </span>  <span class="Constant">&quot;of operands.\n&quot;</span>
 <span id="L19" class="LineNr"> 19 </span>  <span class="Constant">&quot;Each operand has a type. An instruction won't have more than one operand of\n&quot;</span>
@@ -120,7 +120,7 @@ if ('onhashchange' in window) {
 <span id="L56" class="LineNr"> 56 </span><a href='030---operands.cc.html#L58'>init_operand_type_help</a><span class="Delimiter">();</span>
 <span id="L57" class="LineNr"> 57 </span><span class="Delimiter">:(code)</span>
 <span id="L58" class="LineNr"> 58 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L58'>init_operand_type_help</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L59" class="LineNr"> 59 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span>
+<span id="L59" class="LineNr"> 59 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span>
 <span id="L60" class="LineNr"> 60 </span>    <span class="Constant">&quot;2-bit operand controlling the _addressing mode_ of many instructions,\n&quot;</span>
 <span id="L61" class="LineNr"> 61 </span>    <span class="Constant">&quot;to determine how to compute the _effective address_ to look up memory at\n&quot;</span>
 <span id="L62" class="LineNr"> 62 </span>    <span class="Constant">&quot;based on the 'rm32' operand and potentially others.\n&quot;</span>
@@ -141,14 +141,14 @@ if ('onhashchange' in window) {
 <span id="L77" class="LineNr"> 77 </span>    <span class="Constant">&quot;  - modrm.pdf: volume 2, table 2-2, \&quot;</span><span class="Constant">32</span>-bit addressing with the ModR/<span class="Special">M</span> byte<span class="Delimiter">.</span>\<span class="Constant">&quot;.\n&quot;</span>
 <span id="L78" class="LineNr"> 78 </span>    <span class="Constant">&quot;  - sib.pdf: volume 2, table 2-3, \&quot;</span><span class="Constant">32</span>-bit addressing with the SIB byte<span class="Delimiter">.</span>\<span class="Constant">&quot;.\n&quot;</span>
 <span id="L79" class="LineNr"> 79 </span>  <span class="Delimiter">);</span>
-<span id="L80" class="LineNr"> 80 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span>
+<span id="L80" class="LineNr"> 80 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span>
 <span id="L81" class="LineNr"> 81 </span>    <span class="Constant">&quot;Additional 3-bit operand for determining the instruction when the opcode is 81, 8f or ff.\n&quot;</span>
 <span id="L82" class="LineNr"> 82 </span>    <span class="Constant">&quot;Can't coexist with operand of type 'r32' in a single instruction, because the two use the same bits.\n&quot;</span>
 <span id="L83" class="LineNr"> 83 </span>  <span class="Delimiter">);</span>
-<span id="L84" class="LineNr"> 84 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span>
+<span id="L84" class="LineNr"> 84 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span>
 <span id="L85" class="LineNr"> 85 </span>    <span class="Constant">&quot;3-bit operand specifying a register operand used directly, without any further addressing modes.\n&quot;</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Delimiter">);</span>
-<span id="L87" class="LineNr"> 87 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span>
+<span id="L87" class="LineNr"> 87 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span>
 <span id="L88" class="LineNr"> 88 </span>    <span class="Constant">&quot;32-bit value in register or memory. The precise details of its construction\n&quot;</span>
 <span id="L89" class="LineNr"> 89 </span>    <span class="Constant">&quot;depend on the eponymous 3-bit 'rm32' operand, the 'mod' operand, and also\n&quot;</span>
 <span id="L90" class="LineNr"> 90 </span>    <span class="Constant">&quot;potentially the 'SIB' operands ('scale', 'index' and 'base') and a displacement\n&quot;</span>
@@ -159,7 +159,7 @@ if ('onhashchange' in window) {
 <span id="L95" class="LineNr"> 95 </span>    <span class="Constant">&quot;  - modrm.pdf: volume 2, table 2-2, \&quot;</span><span class="Constant">32</span>-bit addressing with the ModR/<span class="Special">M</span> byte<span class="Delimiter">.</span>\<span class="Constant">&quot;.\n&quot;</span>
 <span id="L96" class="LineNr"> 96 </span>    <span class="Constant">&quot;  - sib.pdf: volume 2, table 2-3, \&quot;</span><span class="Constant">32</span>-bit addressing with the SIB byte<span class="Delimiter">.</span>\<span class="Constant">&quot;.\n&quot;</span>
 <span id="L97" class="LineNr"> 97 </span>  <span class="Delimiter">);</span>
-<span id="L98" class="LineNr"> 98 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span>
+<span id="L98" class="LineNr"> 98 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span>
 <span id="L99" class="LineNr"> 99 </span>    <span class="Constant">&quot;Additional 3-bit operand (when 'rm32' is 4, unless 'mod' is 3) specifying the\n&quot;</span>
 <span id="L100" class="LineNr">100 </span>    <span class="Constant">&quot;register containing an address to look up.\n&quot;</span>
 <span id="L101" class="LineNr">101 </span>    <span class="Constant">&quot;This address may be further modified by 'index' and 'scale' operands.\n&quot;</span>
@@ -168,7 +168,7 @@ if ('onhashchange' in window) {
 <span id="L104" class="LineNr">104 </span>    <span class="Constant">&quot;volume 2, table 2-3, \&quot;</span><span class="Constant">32</span>-bit addressing with the SIB byte\<span class="Constant">&quot;.\n&quot;</span>
 <span id="L105" class="LineNr">105 </span>    <span class="Constant">&quot;It is included in this repository as 'sib.pdf'.\n&quot;</span>
 <span id="L106" class="LineNr">106 </span>  <span class="Delimiter">);</span>
-<span id="L107" class="LineNr">107 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span>
+<span id="L107" class="LineNr">107 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span>
 <span id="L108" class="LineNr">108 </span>    <span class="Constant">&quot;Optional 3-bit operand (when 'rm32' is 4 unless 'mod' is 3) that can be added to\n&quot;</span>
 <span id="L109" class="LineNr">109 </span>    <span class="Constant">&quot;the 'base' operand to compute the 'effective address' at which to look up memory.\n&quot;</span>
 <span id="L110" class="LineNr">110 </span>    <span class="Constant">&quot;  effective address = base + index*scale + displacement (disp8 or disp32)\n&quot;</span>
@@ -176,7 +176,7 @@ if ('onhashchange' in window) {
 <span id="L112" class="LineNr">112 </span>    <span class="Constant">&quot;volume 2, table 2-3, \&quot;</span><span class="Constant">32</span>-bit addressing with the SIB byte\<span class="Constant">&quot;.\n&quot;</span>
 <span id="L113" class="LineNr">113 </span>    <span class="Constant">&quot;It is included in this repository as 'sib.pdf'.\n&quot;</span>
 <span id="L114" class="LineNr">114 </span>  <span class="Delimiter">);</span>
-<span id="L115" class="LineNr">115 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;scale&quot;</span><span class="Delimiter">,</span>
+<span id="L115" class="LineNr">115 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;scale&quot;</span><span class="Delimiter">,</span>
 <span id="L116" class="LineNr">116 </span>    <span class="Constant">&quot;Optional 2-bit operand (when 'rm32' is 4 unless 'mod' is 3) that encodes a\n&quot;</span>
 <span id="L117" class="LineNr">117 </span>    <span class="Constant">&quot;power of 2 to be multiplied to the 'index' operand before adding the result to\n&quot;</span>
 <span id="L118" class="LineNr">118 </span>    <span class="Constant">&quot;the 'base' operand to compute the _effective address_ to operate on.\n&quot;</span>
@@ -191,19 +191,19 @@ if ('onhashchange' in window) {
 <span id="L127" class="LineNr">127 </span>    <span class="Constant">&quot;volume 2, table 2-3, \&quot;</span><span class="Constant">32</span>-bit addressing with the SIB byte\<span class="Constant">&quot;.\n&quot;</span>
 <span id="L128" class="LineNr">128 </span>    <span class="Constant">&quot;It is included in this repository as 'sib.pdf'.\n&quot;</span>
 <span id="L129" class="LineNr">129 </span>  <span class="Delimiter">);</span>
-<span id="L130" class="LineNr">130 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">,</span>
+<span id="L130" class="LineNr">130 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">,</span>
 <span id="L131" class="LineNr">131 </span>    <span class="Constant">&quot;8-bit value to be added in many instructions.\n&quot;</span>
 <span id="L132" class="LineNr">132 </span>  <span class="Delimiter">);</span>
-<span id="L133" class="LineNr">133 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">,</span>
+<span id="L133" class="LineNr">133 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">,</span>
 <span id="L134" class="LineNr">134 </span>    <span class="Constant">&quot;16-bit value to be added in many instructions.\n&quot;</span>
 <span id="L135" class="LineNr">135 </span>  <span class="Delimiter">);</span>
-<span id="L136" class="LineNr">136 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">,</span>
+<span id="L136" class="LineNr">136 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">,</span>
 <span id="L137" class="LineNr">137 </span>    <span class="Constant">&quot;32-bit value to be added in many instructions.\n&quot;</span>
 <span id="L138" class="LineNr">138 </span>  <span class="Delimiter">);</span>
-<span id="L139" class="LineNr">139 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">,</span>
+<span id="L139" class="LineNr">139 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">,</span>
 <span id="L140" class="LineNr">140 </span>    <span class="Constant">&quot;8-bit value for many instructions.\n&quot;</span>
 <span id="L141" class="LineNr">141 </span>  <span class="Delimiter">);</span>
-<span id="L142" class="LineNr">142 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">,</span>
+<span id="L142" class="LineNr">142 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='001help.cc.html#L53'>Help</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">,</span>
 <span id="L143" class="LineNr">143 </span>    <span class="Constant">&quot;32-bit value for many instructions.\n&quot;</span>
 <span id="L144" class="LineNr">144 </span>  <span class="Delimiter">);</span>
 <span id="L145" class="LineNr">145 </span><span class="Delimiter">}</span>
@@ -220,13 +220,13 @@ if ('onhashchange' in window) {
 <span id="L156" class="LineNr">156 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L157" class="LineNr">157 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L158" class="LineNr">158 </span>  <span class="Comment">// Pack Operands(segment code)</span>
-<span id="L159" class="LineNr">159 </span>  <a href='003trace.cc.html#L203'>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;-- pack operands&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L160" class="LineNr">160 </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#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L159" class="LineNr">159 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- pack operands&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L160" class="LineNr">160 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L161" class="LineNr">161 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L162" class="LineNr">162 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L163" class="LineNr">163 </span>    <a href='003trace.cc.html#L203'>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;packing instruction '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">with metadata</span><span class="Comment">*/</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L163" class="LineNr">163 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;packing instruction '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">with metadata</span><span class="Comment">*/</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L164" class="LineNr">164 </span>    pack_operands<span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L165" class="LineNr">165 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after packing: '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">without metadata</span><span class="Comment">*/</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L165" class="LineNr">165 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after packing: '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">without metadata</span><span class="Comment">*/</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L166" class="LineNr">166 </span>  <span class="Delimiter">}</span>
 <span id="L167" class="LineNr">167 </span><span class="Delimiter">}</span>
 <span id="L168" class="LineNr">168 </span>
@@ -253,7 +253,7 @@ if ('onhashchange' in window) {
 <span id="L189" class="LineNr">189 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L189'>add_modrm_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L190" class="LineNr">190 </span>  <span class="Normal">uint8_t</span> mod=<span class="Constant">0</span><span class="Delimiter">,</span> reg_subop=<span class="Constant">0</span><span class="Delimiter">,</span> rm32=<span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L191" class="LineNr">191 </span>  <span class="Normal">bool</span> emit =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L192" class="LineNr">192 </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>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L192" class="LineNr">192 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L193" class="LineNr">193 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L194" class="LineNr">194 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L195" class="LineNr">195 </span>      mod = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
@@ -279,7 +279,7 @@ if ('onhashchange' in window) {
 <span id="L215" class="LineNr">215 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L215'>add_sib_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L216" class="LineNr">216 </span>  <span class="Normal">uint8_t</span> scale=<span class="Constant">0</span><span class="Delimiter">,</span> index=<span class="Constant">0</span><span class="Delimiter">,</span> base=<span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L217" class="LineNr">217 </span>  <span class="Normal">bool</span> emit =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L218" class="LineNr">218 </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>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L218" class="LineNr">218 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L219" class="LineNr">219 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L220" class="LineNr">220 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;scale&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L221" class="LineNr">221 </span>      scale = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
@@ -299,7 +299,7 @@ if ('onhashchange' in window) {
 <span id="L235" class="LineNr">235 </span><span class="Delimiter">}</span>
 <span id="L236" class="LineNr">236 </span>
 <span id="L237" class="LineNr">237 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L237'>add_disp_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L238" class="LineNr">238 </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>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L238" class="LineNr">238 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L239" class="LineNr">239 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L240" class="LineNr">240 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">))</span>
 <span id="L241" class="LineNr">241 </span>      emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
@@ -311,7 +311,7 @@ if ('onhashchange' in window) {
 <span id="L247" class="LineNr">247 </span><span class="Delimiter">}</span>
 <span id="L248" class="LineNr">248 </span>
 <span id="L249" class="LineNr">249 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L249'>add_imm_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L250" class="LineNr">250 </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>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L250" class="LineNr">250 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L251" class="LineNr">251 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L252" class="LineNr">252 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">))</span>
 <span id="L253" class="LineNr">253 </span>      emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
@@ -356,7 +356,7 @@ if ('onhashchange' in window) {
 <span id="L292" class="LineNr">292 </span>
 <span id="L293" class="LineNr">293 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> vector&lt;word&gt;&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L294" class="LineNr">294 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L295" class="LineNr">295 </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>in<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L296" class="LineNr">296 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
 <span id="L297" class="LineNr">297 </span>    out &lt;&lt; in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span>
 <span id="L298" class="LineNr">298 </span>  <span class="Delimiter">}</span>
@@ -395,7 +395,7 @@ if ('onhashchange' in window) {
 <span id="L331" class="LineNr">331 </span>  <a href='011run.cc.html#L99'>program</a> p<span class="Delimiter">;</span>
 <span id="L332" class="LineNr">332 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
 <span id="L333" class="LineNr">333 </span>  parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<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#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</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#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L335" class="LineNr">335 </span>  <a href='011run.cc.html#L231'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
 <span id="L336" class="LineNr">336 </span><span class="Delimiter">}</span>
 <span id="L337" class="LineNr">337 </span>
@@ -441,7 +441,7 @@ if ('onhashchange' in window) {
 <span id="L377" class="LineNr">377 </span>
 <span id="L378" class="LineNr">378 </span><span class="Delimiter">:(code)</span>
 <span id="L379" class="LineNr">379 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L380" class="LineNr">380 </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>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L380" class="LineNr">380 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L381" class="LineNr">381 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
 <span id="L382" class="LineNr">382 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L383" class="LineNr">383 </span>  <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
@@ -450,7 +450,7 @@ if ('onhashchange' in window) {
 <span id="L386" class="LineNr">386 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L386'>is_hex_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L387" class="LineNr">387 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L396'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
 <span id="L388" class="LineNr">388 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L389" class="LineNr">389 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span>
+<span id="L389" class="LineNr">389 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span>
 <span id="L390" class="LineNr">390 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L391" class="LineNr">391 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>find_first_not_of<span class="Delimiter">(</span><span class="Constant">&quot;0123456789abcdefABCDEF&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span>
 <span id="L392" class="LineNr">392 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
@@ -458,7 +458,7 @@ if ('onhashchange' in window) {
 <span id="L394" class="LineNr">394 </span><span class="Delimiter">}</span>
 <span id="L395" class="LineNr">395 </span>
 <span id="L396" class="LineNr">396 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L396'>contains_any_operand_metadata</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; <a href='011run.cc.html#L123'>word</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L397" class="LineNr">397 </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='011run.cc.html#L123'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L397" class="LineNr">397 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L398" class="LineNr">398 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> != <span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>end<span class="Delimiter">())</span>
 <span id="L399" class="LineNr">399 </span>      <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L400" class="LineNr">400 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
@@ -466,10 +466,10 @@ if ('onhashchange' in window) {
 <span id="L402" class="LineNr">402 </span>
 <span id="L403" class="LineNr">403 </span><span class="Normal">bool</span> has_operand_metadata<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L404" class="LineNr">404 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L405" class="LineNr">405 </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>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L405" class="LineNr">405 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L406" class="LineNr">406 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L407" class="LineNr">407 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L408" class="LineNr">408 </span>      <a href='003trace.cc.html#L210'>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;' has conflicting &quot;</span> &lt;&lt; m &lt;&lt; <span class="Constant">&quot; operands\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L408" class="LineNr">408 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' has conflicting &quot;</span> &lt;&lt; m &lt;&lt; <span class="Constant">&quot; operands\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L409" class="LineNr">409 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L410" class="LineNr">410 </span>    <span class="Delimiter">}</span>
 <span id="L411" class="LineNr">411 </span>    result =<span class="Constant"> true</span><span class="Delimiter">;</span>
@@ -480,11 +480,11 @@ if ('onhashchange' in window) {
 <span id="L416" class="LineNr">416 </span><span class="Normal">bool</span> has_operand_metadata<span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L417" class="LineNr">417 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L418" class="LineNr">418 </span>  <span class="Normal">bool</span> metadata_found =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L419" class="LineNr">419 </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="L419" class="LineNr">419 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L420" class="LineNr">420 </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="L421" class="LineNr">421 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>find<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> == <span class="Special"><a href='030---operands.cc.html#L40'>Instruction_operands</a></span><span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
 <span id="L422" class="LineNr">422 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>metadata_found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L423" class="LineNr">423 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L423" class="LineNr">423 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L424" class="LineNr">424 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L425" class="LineNr">425 </span>    <span class="Delimiter">}</span>
 <span id="L426" class="LineNr">426 </span>    metadata_found =<span class="Constant"> true</span><span class="Delimiter">;</span>
@@ -494,7 +494,7 @@ if ('onhashchange' in window) {
 <span id="L430" class="LineNr">430 </span><span class="Delimiter">}</span>
 <span id="L431" class="LineNr">431 </span>
 <span id="L432" class="LineNr">432 </span><a href='011run.cc.html#L123'>word</a> metadata<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L433" class="LineNr">433 </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>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L433" class="LineNr">433 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L434" class="LineNr">434 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span>
 <span id="L435" class="LineNr">435 </span>      <span class="Identifier">return</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L436" class="LineNr">436 </span>  assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
@@ -511,7 +511,7 @@ if ('onhashchange' in window) {
 <span id="L447" class="LineNr">447 </span><span class="Delimiter">:(code)</span>
 <span id="L448" class="LineNr">448 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L449" class="LineNr">449 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L450" class="LineNr">450 </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>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L450" class="LineNr">450 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L451" class="LineNr">451 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
 <span id="L452" class="LineNr">452 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original<span class="Delimiter">;</span>
 <span id="L453" class="LineNr">453 </span>  <span class="Delimiter">}</span>
diff --git a/html/subx/031check_operands.cc.html b/html/subx/031check_operands.cc.html
index 2cab24d2..31e4307f 100644
--- a/html/subx/031check_operands.cc.html
+++ b/html/subx/031check_operands.cc.html
@@ -75,14 +75,14 @@ if ('onhashchange' in window) {
 <span id="L9" class="LineNr">  9 </span>
 <span id="L10" class="LineNr"> 10 </span><span class="Delimiter">:(before &quot;Pack Operands(segment code)&quot;)</span>
 <span id="L11" class="LineNr"> 11 </span>check_operands<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">);</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L12" class="LineNr"> 12 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L13" class="LineNr"> 13 </span>
 <span id="L14" class="LineNr"> 14 </span><span class="Delimiter">:(code)</span>
 <span id="L15" class="LineNr"> 15 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L16" class="LineNr"> 16 </span>  <a href='003trace.cc.html#L203'>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 operands&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L17" class="LineNr"> 17 </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#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L16" class="LineNr"> 16 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check operands&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L17" class="LineNr"> 17 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L18" class="LineNr"> 18 </span>    check_operands<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L19" class="LineNr"> 19 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>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="L19" class="LineNr"> 19 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// stop at the first mal-formed instruction</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Delimiter">}</span>
 <span id="L21" class="LineNr"> 21 </span><span class="Delimiter">}</span>
 <span id="L22" class="LineNr"> 22 </span>
@@ -102,9 +102,9 @@ if ('onhashchange' in window) {
 <span id="L36" class="LineNr"> 36 </span><a href='011run.cc.html#L123'>word</a> <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L37" class="LineNr"> 37 </span>  op<span class="Delimiter">.</span>data = <a href='031check_operands.cc.html#L558'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
 <span id="L38" class="LineNr"> 38 </span>  <span class="Comment">// opcodes can't be negative</span>
-<span id="L39" class="LineNr"> 39 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span>
+<span id="L39" class="LineNr"> 39 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L102'>starts_with</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span>
 <span id="L40" class="LineNr"> 40 </span>    op<span class="Delimiter">.</span>data = op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L41" class="LineNr"> 41 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span>
+<span id="L41" class="LineNr"> 41 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span>
 <span id="L42" class="LineNr"> 42 </span>    op<span class="Delimiter">.</span>data = string<span class="Delimiter">(</span><span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span>+op<span class="Delimiter">.</span>data<span class="Delimiter">;</span>
 <span id="L43" class="LineNr"> 43 </span>  <span class="Identifier">return</span> op<span class="Delimiter">;</span>
 <span id="L44" class="LineNr"> 44 </span><span class="Delimiter">}</span>
@@ -160,145 +160,145 @@ if ('onhashchange' in window) {
 <span id="L94" class="LineNr"> 94 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L94'>init_permitted_operands</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L95" class="LineNr"> 95 </span>  <span class="SalientComment">//// Class A: just op, no operands</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Comment">// halt</span>
-<span id="L97" class="LineNr"> 97 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f4&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L97" class="LineNr"> 97 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f4&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
 <span id="L98" class="LineNr"> 98 </span>  <span class="Comment">// inc</span>
-<span id="L99" class="LineNr"> 99 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;40&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L100" class="LineNr">100 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;41&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L101" class="LineNr">101 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;42&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L102" class="LineNr">102 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;43&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L103" class="LineNr">103 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;44&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L104" class="LineNr">104 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;45&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L105" class="LineNr">105 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;46&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L106" class="LineNr">106 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;47&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L99" class="LineNr"> 99 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;40&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L100" class="LineNr">100 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;41&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L101" class="LineNr">101 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;42&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L102" class="LineNr">102 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;43&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L103" class="LineNr">103 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;44&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L104" class="LineNr">104 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;45&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L105" class="LineNr">105 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;46&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L106" class="LineNr">106 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;47&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
 <span id="L107" class="LineNr">107 </span>  <span class="Comment">// dec</span>
-<span id="L108" class="LineNr">108 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;48&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L109" class="LineNr">109 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;49&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L110" class="LineNr">110 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L111" class="LineNr">111 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L112" class="LineNr">112 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L113" class="LineNr">113 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L114" class="LineNr">114 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L115" class="LineNr">115 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L108" class="LineNr">108 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;48&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L109" class="LineNr">109 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;49&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L110" class="LineNr">110 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L111" class="LineNr">111 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L112" class="LineNr">112 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L113" class="LineNr">113 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L114" class="LineNr">114 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L115" class="LineNr">115 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
 <span id="L116" class="LineNr">116 </span>  <span class="Comment">// push</span>
-<span id="L117" class="LineNr">117 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L118" class="LineNr">118 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L119" class="LineNr">119 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L120" class="LineNr">120 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L121" class="LineNr">121 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L122" class="LineNr">122 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L123" class="LineNr">123 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L124" class="LineNr">124 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L117" class="LineNr">117 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L118" class="LineNr">118 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L119" class="LineNr">119 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L120" class="LineNr">120 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L121" class="LineNr">121 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L122" class="LineNr">122 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L123" class="LineNr">123 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L124" class="LineNr">124 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
 <span id="L125" class="LineNr">125 </span>  <span class="Comment">// pop</span>
-<span id="L126" class="LineNr">126 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L127" class="LineNr">127 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L128" class="LineNr">128 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L129" class="LineNr">129 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L130" class="LineNr">130 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L131" class="LineNr">131 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L132" class="LineNr">132 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L133" class="LineNr">133 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L126" class="LineNr">126 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L128" class="LineNr">128 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L129" class="LineNr">129 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L130" class="LineNr">130 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L131" class="LineNr">131 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L132" class="LineNr">132 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L133" class="LineNr">133 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
 <span id="L134" class="LineNr">134 </span>  <span class="Comment">// return</span>
-<span id="L135" class="LineNr">135 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L135" class="LineNr">135 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
 <span id="L136" class="LineNr">136 </span>
 <span id="L137" class="LineNr">137 </span>  <span class="SalientComment">//// Class B: just op and disp8</span>
 <span id="L138" class="LineNr">138 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
 <span id="L139" class="LineNr">139 </span>  <span class="Comment">//  0     0     0      |0       1     0     0</span>
 <span id="L140" class="LineNr">140 </span>
 <span id="L141" class="LineNr">141 </span>  <span class="Comment">// jump</span>
-<span id="L142" class="LineNr">142 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;eb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L143" class="LineNr">143 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;74&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L144" class="LineNr">144 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;75&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L145" class="LineNr">145 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L146" class="LineNr">146 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L147" class="LineNr">147 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L148" class="LineNr">148 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L142" class="LineNr">142 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;eb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L143" class="LineNr">143 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;74&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L144" class="LineNr">144 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;75&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L145" class="LineNr">145 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L147" class="LineNr">147 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L148" class="LineNr">148 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
 <span id="L149" class="LineNr">149 </span>
 <span id="L150" class="LineNr">150 </span>  <span class="SalientComment">//// Class D: just op and disp32</span>
 <span id="L151" class="LineNr">151 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
 <span id="L152" class="LineNr">152 </span>  <span class="Comment">//  0     0     1      |0       0     0     0</span>
-<span id="L153" class="LineNr">153 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>  <span class="Comment">// call</span>
-<span id="L154" class="LineNr">154 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>  <span class="Comment">// jump</span>
+<span id="L153" class="LineNr">153 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>  <span class="Comment">// call</span>
+<span id="L154" class="LineNr">154 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>  <span class="Comment">// jump</span>
 <span id="L155" class="LineNr">155 </span>
 <span id="L156" class="LineNr">156 </span>  <span class="SalientComment">//// Class E: just op and imm8</span>
 <span id="L157" class="LineNr">157 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
 <span id="L158" class="LineNr">158 </span>  <span class="Comment">//  0     1     0      |0       0     0     0</span>
-<span id="L159" class="LineNr">159 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;cd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x20</span><span class="Delimiter">);</span>  <span class="Comment">// software interrupt</span>
+<span id="L159" class="LineNr">159 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;cd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x20</span><span class="Delimiter">);</span>  <span class="Comment">// software interrupt</span>
 <span id="L160" class="LineNr">160 </span>
 <span id="L161" class="LineNr">161 </span>  <span class="SalientComment">//// Class F: just op and imm32</span>
 <span id="L162" class="LineNr">162 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
 <span id="L163" class="LineNr">163 </span>  <span class="Comment">//  1     0     0      |0       0     0     0</span>
-<span id="L164" class="LineNr">164 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// add</span>
-<span id="L165" class="LineNr">165 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// subtract</span>
-<span id="L166" class="LineNr">166 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// and</span>
-<span id="L167" class="LineNr">167 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// or</span>
-<span id="L168" class="LineNr">168 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// xor</span>
-<span id="L169" class="LineNr">169 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// compare</span>
-<span id="L170" class="LineNr">170 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// push</span>
+<span id="L164" class="LineNr">164 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// add</span>
+<span id="L165" class="LineNr">165 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// subtract</span>
+<span id="L166" class="LineNr">166 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// and</span>
+<span id="L167" class="LineNr">167 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// or</span>
+<span id="L168" class="LineNr">168 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// xor</span>
+<span id="L169" class="LineNr">169 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// compare</span>
+<span id="L170" class="LineNr">170 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// push</span>
 <span id="L171" class="LineNr">171 </span>  <span class="Comment">// copy</span>
-<span id="L172" class="LineNr">172 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L173" class="LineNr">173 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L174" class="LineNr">174 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L175" class="LineNr">175 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L176" class="LineNr">176 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L177" class="LineNr">177 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L178" class="LineNr">178 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L179" class="LineNr">179 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L172" class="LineNr">172 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L173" class="LineNr">173 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L174" class="LineNr">174 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L175" class="LineNr">175 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L176" class="LineNr">176 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L177" class="LineNr">177 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L178" class="LineNr">178 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L179" class="LineNr">179 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
 <span id="L180" class="LineNr">180 </span>
 <span id="L181" class="LineNr">181 </span>  <span class="SalientComment">//// Class M: using ModR/M byte</span>
 <span id="L182" class="LineNr">182 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
 <span id="L183" class="LineNr">183 </span>  <span class="Comment">//  0     0     0      |0       0     0     1</span>
 <span id="L184" class="LineNr">184 </span>
 <span id="L185" class="LineNr">185 </span>  <span class="Comment">// add</span>
-<span id="L186" class="LineNr">186 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;01&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L187" class="LineNr">187 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;03&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L186" class="LineNr">186 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;01&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L187" class="LineNr">187 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;03&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
 <span id="L188" class="LineNr">188 </span>  <span class="Comment">// subtract</span>
-<span id="L189" class="LineNr">189 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;29&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L190" class="LineNr">190 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L189" class="LineNr">189 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;29&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L190" class="LineNr">190 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
 <span id="L191" class="LineNr">191 </span>  <span class="Comment">// and</span>
-<span id="L192" class="LineNr">192 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L193" class="LineNr">193 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L192" class="LineNr">192 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L193" class="LineNr">193 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
 <span id="L194" class="LineNr">194 </span>  <span class="Comment">// or</span>
-<span id="L195" class="LineNr">195 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L196" class="LineNr">196 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L195" class="LineNr">195 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L196" class="LineNr">196 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
 <span id="L197" class="LineNr">197 </span>  <span class="Comment">// xor</span>
-<span id="L198" class="LineNr">198 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L199" class="LineNr">199 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;33&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L198" class="LineNr">198 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L199" class="LineNr">199 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;33&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
 <span id="L200" class="LineNr">200 </span>  <span class="Comment">// compare</span>
-<span id="L201" class="LineNr">201 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L202" class="LineNr">202 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L201" class="LineNr">201 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L202" class="LineNr">202 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
 <span id="L203" class="LineNr">203 </span>  <span class="Comment">// copy</span>
-<span id="L204" class="LineNr">204 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;88&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L205" class="LineNr">205 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L206" class="LineNr">206 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L207" class="LineNr">207 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L204" class="LineNr">204 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;88&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L205" class="LineNr">205 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L206" class="LineNr">206 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L207" class="LineNr">207 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
 <span id="L208" class="LineNr">208 </span>  <span class="Comment">// swap</span>
-<span id="L209" class="LineNr">209 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L209" class="LineNr">209 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
 <span id="L210" class="LineNr">210 </span>  <span class="Comment">// copy address (lea)</span>
-<span id="L211" class="LineNr">211 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L211" class="LineNr">211 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
 <span id="L212" class="LineNr">212 </span>  <span class="Comment">// pop</span>
-<span id="L213" class="LineNr">213 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L213" class="LineNr">213 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
 <span id="L214" class="LineNr">214 </span>
 <span id="L215" class="LineNr">215 </span>  <span class="SalientComment">//// Class N: op, ModR/M and subop (not r32)</span>
 <span id="L216" class="LineNr">216 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
 <span id="L217" class="LineNr">217 </span>  <span class="Comment">//  0     0     0      |0       0     1     1</span>
-<span id="L218" class="LineNr">218 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;d3&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// shift</span>
-<span id="L219" class="LineNr">219 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// test/not/mul/div</span>
-<span id="L220" class="LineNr">220 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// jump/push/call</span>
+<span id="L218" class="LineNr">218 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;d3&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// shift</span>
+<span id="L219" class="LineNr">219 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// test/not/mul/div</span>
+<span id="L220" class="LineNr">220 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// jump/push/call</span>
 <span id="L221" class="LineNr">221 </span>
 <span id="L222" class="LineNr">222 </span>  <span class="SalientComment">//// Class O: op, ModR/M, subop (not r32) and imm8</span>
 <span id="L223" class="LineNr">223 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
 <span id="L224" class="LineNr">224 </span>  <span class="Comment">//  0     1     0      |0       0     1     1</span>
-<span id="L225" class="LineNr">225 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c1&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x23</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
+<span id="L225" class="LineNr">225 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c1&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x23</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
 <span id="L226" class="LineNr">226 </span>
 <span id="L227" class="LineNr">227 </span>  <span class="SalientComment">//// Class P: op, ModR/M and imm32</span>
 <span id="L228" class="LineNr">228 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
 <span id="L229" class="LineNr">229 </span>  <span class="Comment">//  1     0     0      |0       0     0     1</span>
-<span id="L230" class="LineNr">230 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x41</span><span class="Delimiter">);</span>  <span class="Comment">// copy</span>
+<span id="L230" class="LineNr">230 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x41</span><span class="Delimiter">);</span>  <span class="Comment">// copy</span>
 <span id="L231" class="LineNr">231 </span>
 <span id="L232" class="LineNr">232 </span>  <span class="SalientComment">//// Class Q: op, ModR/M, subop (not r32) and imm32</span>
 <span id="L233" class="LineNr">233 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
 <span id="L234" class="LineNr">234 </span>  <span class="Comment">//  1     0     0      |0       0     1     1</span>
-<span id="L235" class="LineNr">235 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
+<span id="L235" class="LineNr">235 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
 <span id="L236" class="LineNr">236 </span>
 <span id="L237" class="LineNr">237 </span>  <span class="Comment">// End Init Permitted Operands</span>
 <span id="L238" class="LineNr">238 </span><span class="Delimiter">}</span>
@@ -325,16 +325,16 @@ if ('onhashchange' in window) {
 <span id="L259" class="LineNr">259 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L259'>compare_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L260" class="LineNr">260 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L294'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
 <span id="L261" class="LineNr">261 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L285'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L262" class="LineNr">262 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>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="L262" class="LineNr">262 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
 <span id="L263" class="LineNr">263 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
 <span id="L264" class="LineNr">264 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L265" class="LineNr">265 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
 <span id="L266" class="LineNr">266 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
 <span id="L267" class="LineNr">267 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L69'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L268" class="LineNr">268 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
-<span id="L269" class="LineNr">269 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L269" class="LineNr">269 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L270" class="LineNr">270 </span>    <span class="Normal">else</span>
-<span id="L271" class="LineNr">271 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L271" class="LineNr">271 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L272" class="LineNr">272 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
 <span id="L273" class="LineNr">273 </span>  <span class="Delimiter">}</span>
 <span id="L274" class="LineNr">274 </span>  <span class="Comment">// ignore settings in any unused bits</span>
@@ -350,15 +350,15 @@ if ('onhashchange' in window) {
 <span id="L284" class="LineNr">284 </span>
 <span id="L285" class="LineNr">285 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L285'>compute_operand_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L286" class="LineNr">286 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L287" class="LineNr">287 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L287" class="LineNr">287 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L288" class="LineNr">288 </span>    bitvector = bitvector | <a href='031check_operands.cc.html#L311'>bitvector_for_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L289" class="LineNr">289 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L90'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L289" class="LineNr">289 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L90'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
 <span id="L290" class="LineNr">290 </span>  <span class="Delimiter">}</span>
 <span id="L291" class="LineNr">291 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
 <span id="L292" class="LineNr">292 </span><span class="Delimiter">}</span>
 <span id="L293" class="LineNr">293 </span>
 <span id="L294" class="LineNr">294 </span><span class="Normal">bool</span> <a href='031check_operands.cc.html#L294'>has_operands</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L295" class="LineNr">295 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> &gt; <a href='031check_operands.cc.html#L298'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> &gt; <a href='031check_operands.cc.html#L298'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
 <span id="L296" class="LineNr">296 </span><span class="Delimiter">}</span>
 <span id="L297" class="LineNr">297 </span>
 <span id="L298" class="LineNr">298 </span><span class="Normal">int</span> <a href='031check_operands.cc.html#L298'>first_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -377,11 +377,11 @@ if ('onhashchange' in window) {
 <span id="L311" class="LineNr">311 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L311'>bitvector_for_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L312" class="LineNr">312 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L313" class="LineNr">313 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L314" class="LineNr">314 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#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="L314" class="LineNr">314 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L315" class="LineNr">315 </span>    <span class="Normal">const</span> string&amp; curr = w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L316" class="LineNr">316 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L70'>Operand_type</a></span><span class="Delimiter">,</span> curr<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
 <span id="L317" class="LineNr">317 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L318" class="LineNr">318 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L318" class="LineNr">318 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L319" class="LineNr">319 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L90'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
 <span id="L320" class="LineNr">320 </span>    <span class="Delimiter">}</span>
 <span id="L321" class="LineNr">321 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L70'>Operand_type</a></span><span class="Delimiter">,</span> curr<span class="Delimiter">));</span>
@@ -415,7 +415,7 @@ if ('onhashchange' in window) {
 <span id="L349" class="LineNr">349 </span>    <a href='031check_operands.cc.html#L404'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
 <span id="L350" class="LineNr">350 </span>    <a href='031check_operands.cc.html#L409'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;should be replaced by subop&quot;</span><span class="Delimiter">);</span>
 <span id="L351" class="LineNr">351 </span>  <span class="Delimiter">}</span>
-<span id="L352" class="LineNr">352 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L352" class="LineNr">352 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L353" class="LineNr">353 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span>data != <span class="Constant">&quot;4&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L354" class="LineNr">354 </span>  <span class="Comment">// SIB byte checks</span>
 <span id="L355" class="LineNr">355 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
@@ -436,7 +436,7 @@ if ('onhashchange' in window) {
 <span id="L370" class="LineNr">370 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L370'>compare_bitvector_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L371" class="LineNr">371 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L294'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
 <span id="L372" class="LineNr">372 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L285'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L373" class="LineNr">373 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>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="L373" class="LineNr">373 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
 <span id="L374" class="LineNr">374 </span>  expected = CLEAR<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">);</span>  <span class="Comment">// exception 1</span>
 <span id="L375" class="LineNr">375 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
 <span id="L376" class="LineNr">376 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -446,7 +446,7 @@ if ('onhashchange' in window) {
 <span id="L380" class="LineNr">380 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L61'>DISP8</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L381" class="LineNr">381 </span>      <span class="Normal">int32_t</span> mod = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
 <span id="L382" class="LineNr">382 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Constant">1</span><span class="Delimiter">)</span>
-<span id="L383" class="LineNr">383 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L383" class="LineNr">383 </span>        <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L384" class="LineNr">384 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
 <span id="L385" class="LineNr">385 </span>    <span class="Delimiter">}</span>
 <span id="L386" class="LineNr">386 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L63'>DISP32</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -455,13 +455,13 @@ if ('onhashchange' in window) {
 <span id="L389" class="LineNr">389 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>mod == <span class="Constant">0</span> &amp;&amp; rm32 == <span class="Constant">5</span><span class="Delimiter">)</span>
 <span id="L390" class="LineNr">390 </span>        <span class="Delimiter">;</span>  <span class="Comment">// ok: special-case for loading address from disp32</span>
 <span id="L391" class="LineNr">391 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Constant">2</span><span class="Delimiter">)</span>
-<span id="L392" class="LineNr">392 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L392" class="LineNr">392 </span>        <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L393" class="LineNr">393 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
 <span id="L394" class="LineNr">394 </span>    <span class="Delimiter">}</span>
 <span id="L395" class="LineNr">395 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
-<span id="L396" class="LineNr">396 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L396" class="LineNr">396 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L397" class="LineNr">397 </span>    <span class="Normal">else</span>
-<span id="L398" class="LineNr">398 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L398" class="LineNr">398 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L399" class="LineNr">399 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
 <span id="L400" class="LineNr">400 </span>  <span class="Delimiter">}</span>
 <span id="L401" class="LineNr">401 </span>  <span class="Comment">// ignore settings in any unused bits</span>
@@ -469,12 +469,12 @@ if ('onhashchange' in window) {
 <span id="L403" class="LineNr">403 </span>
 <span id="L404" class="LineNr">404 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L404'>check_operand_metadata_present</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L405" class="LineNr">405 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
-<span id="L406" class="LineNr">406 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L406" class="LineNr">406 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L407" class="LineNr">407 </span><span class="Delimiter">}</span>
 <span id="L408" class="LineNr">408 </span>
 <span id="L409" class="LineNr">409 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L409'>check_operand_metadata_absent</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; msg<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L410" class="LineNr">410 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
-<span id="L411" class="LineNr">411 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand (&quot;</span> &lt;&lt; msg &lt;&lt; <span class="Constant">&quot;)\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L411" class="LineNr">411 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand (&quot;</span> &lt;&lt; msg &lt;&lt; <span class="Constant">&quot;)\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L412" class="LineNr">412 </span><span class="Delimiter">}</span>
 <span id="L413" class="LineNr">413 </span>
 <span id="L414" class="LineNr">414 </span><span class="Delimiter">:(scenarios transform)</span>
@@ -544,20 +544,20 @@ if ('onhashchange' in window) {
 <span id="L478" class="LineNr">478 </span><span class="Delimiter">:(code)</span>
 <span id="L479" class="LineNr">479 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L525'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L480" class="LineNr">480 </span>  assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
-<span id="L481" class="LineNr">481 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L482" class="LineNr">482 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L481" class="LineNr">481 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L482" class="LineNr">482 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L483" class="LineNr">483 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L484" class="LineNr">484 </span>  <span class="Delimiter">}</span>
 <span id="L485" class="LineNr">485 </span>  <a href='011run.cc.html#L123'>word</a> op = <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
 <span id="L486" class="LineNr">486 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L487" class="LineNr">487 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown 2-byte opcode '0f &quot;</span> &lt;&lt; op<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L487" class="LineNr">487 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown 2-byte opcode '0f &quot;</span> &lt;&lt; op<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L488" class="LineNr">488 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L489" class="LineNr">489 </span>  <span class="Delimiter">}</span>
 <span id="L490" class="LineNr">490 </span>  <a href='031check_operands.cc.html#L525'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
 <span id="L491" class="LineNr">491 </span><span class="Delimiter">}</span>
 <span id="L492" class="LineNr">492 </span>
 <span id="L493" class="LineNr">493 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L493'>check_operands_f3</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L494" class="LineNr">494 </span>  <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L494" class="LineNr">494 </span>  <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L495" class="LineNr">495 </span><span class="Delimiter">}</span>
 <span id="L496" class="LineNr">496 </span>
 <span id="L497" class="LineNr">497 </span><span class="Delimiter">:(scenario check_missing_disp32_operand)</span>
@@ -575,17 +575,17 @@ if ('onhashchange' in window) {
 <span id="L509" class="LineNr">509 </span><span class="SalientComment">//// Class D: just op and disp32</span>
 <span id="L510" class="LineNr">510 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
 <span id="L511" class="LineNr">511 </span><span class="Comment">//  0     0     1      |0       0     0     0</span>
-<span id="L512" class="LineNr">512 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L513" class="LineNr">513 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L514" class="LineNr">514 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L515" class="LineNr">515 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L516" class="LineNr">516 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L517" class="LineNr">517 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L512" class="LineNr">512 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L513" class="LineNr">513 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L514" class="LineNr">514 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L515" class="LineNr">515 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L516" class="LineNr">516 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L517" class="LineNr">517 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
 <span id="L518" class="LineNr">518 </span>
 <span id="L519" class="LineNr">519 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
 <span id="L520" class="LineNr">520 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
 <span id="L521" class="LineNr">521 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
-<span id="L522" class="LineNr">522 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L522" class="LineNr">522 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
 <span id="L523" class="LineNr">523 </span>
 <span id="L524" class="LineNr">524 </span><span class="Delimiter">:(code)</span>
 <span id="L525" class="LineNr">525 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L525'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -598,16 +598,16 @@ if ('onhashchange' in window) {
 <span id="L532" class="LineNr">532 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L532'>compare_bitvector_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L533" class="LineNr">533 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L294'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
 <span id="L534" class="LineNr">534 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L285'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L535" class="LineNr">535 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>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="L535" class="LineNr">535 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
 <span id="L536" class="LineNr">536 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
 <span id="L537" class="LineNr">537 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L538" class="LineNr">538 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
 <span id="L539" class="LineNr">539 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
 <span id="L540" class="LineNr">540 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L69'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L541" class="LineNr">541 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
-<span id="L542" class="LineNr">542 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L550'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L542" class="LineNr">542 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L550'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L543" class="LineNr">543 </span>    <span class="Normal">else</span>
-<span id="L544" class="LineNr">544 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L550'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L544" class="LineNr">544 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L550'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L545" class="LineNr">545 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
 <span id="L546" class="LineNr">546 </span>  <span class="Delimiter">}</span>
 <span id="L547" class="LineNr">547 </span>  <span class="Comment">// ignore settings in any unused bits</span>
diff --git a/html/subx/032check_operand_bounds.cc.html b/html/subx/032check_operand_bounds.cc.html
index c5d90760..b22414d2 100644
--- a/html/subx/032check_operand_bounds.cc.html
+++ b/html/subx/032check_operand_bounds.cc.html
@@ -75,30 +75,30 @@ if ('onhashchange' in window) {
 <span id="L9" class="LineNr"> 9 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
 <span id="L10" class="LineNr">10 </span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt; <span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">;</span>
 <span id="L11" class="LineNr">11 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L12" class="LineNr">12 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L13" class="LineNr">13 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L14" class="LineNr">14 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L15" class="LineNr">15 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L16" class="LineNr">16 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L17" class="LineNr">17 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;scale&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L18" class="LineNr">18 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L19" class="LineNr">19 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
-<span id="L20" class="LineNr">20 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
+<span id="L12" class="LineNr">12 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L13" class="LineNr">13 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L14" class="LineNr">14 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L15" class="LineNr">15 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L16" class="LineNr">16 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L17" class="LineNr">17 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;scale&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L18" class="LineNr">18 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L19" class="LineNr">19 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L20" class="LineNr">20 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
 <span id="L21" class="LineNr">21 </span><span class="Comment">// no bound needed for disp32</span>
-<span id="L22" class="LineNr">22 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L22" class="LineNr">22 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
 <span id="L23" class="LineNr">23 </span><span class="Comment">// no bound needed for imm32</span>
 <span id="L24" class="LineNr">24 </span>
 <span id="L25" class="LineNr">25 </span><span class="Delimiter">:(before &quot;Pack Operands(segment code)&quot;)</span>
 <span id="L26" class="LineNr">26 </span>check_operand_bounds<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">);</span>
-<span id="L27" class="LineNr">27 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L27" class="LineNr">27 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L28" class="LineNr">28 </span><span class="Delimiter">:(code)</span>
 <span id="L29" class="LineNr">29 </span><span class="Normal">void</span> check_operand_bounds<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L30" class="LineNr">30 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check operand bounds&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L31" class="LineNr">31 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L30" class="LineNr">30 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check operand bounds&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L31" class="LineNr">31 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L32" class="LineNr">32 </span>    <span class="Normal">const</span> line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L33" class="LineNr">33 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <a href='031check_operands.cc.html#L298'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
+<span id="L33" class="LineNr">33 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <a href='031check_operands.cc.html#L298'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
 <span id="L34" class="LineNr">34 </span>      check_operand_bounds<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span>
-<span id="L35" class="LineNr">35 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>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="L35" class="LineNr">35 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// stop at the first mal-formed instruction</span>
 <span id="L36" class="LineNr">36 </span>  <span class="Delimiter">}</span>
 <span id="L37" class="LineNr">37 </span><span class="Delimiter">}</span>
 <span id="L38" class="LineNr">38 </span>
@@ -109,12 +109,12 @@ if ('onhashchange' in window) {
 <span id="L43" class="LineNr">43 </span>    <span class="Normal">int32_t</span> x = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
 <span id="L44" class="LineNr">44 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>x &gt;= <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L45" class="LineNr">45 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span>x<span class="Delimiter">)</span> &gt;= p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">)</span>
-<span id="L46" class="LineNr">46 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' too large to fit in bitfield &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L46" class="LineNr">46 </span>        <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' too large to fit in bitfield &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L47" class="LineNr">47 </span>    <span class="Delimiter">}</span>
 <span id="L48" class="LineNr">48 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L49" class="LineNr">49 </span>      <span class="Comment">// hacky? assuming bound is a power of 2</span>
 <span id="L50" class="LineNr">50 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>x &lt; -<span class="Constant">1</span>*<span class="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second/<span class="Constant">2</span><span class="Delimiter">))</span>
-<span id="L51" class="LineNr">51 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' too large to fit in bitfield &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L51" class="LineNr">51 </span>        <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' too large to fit in bitfield &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L52" class="LineNr">52 </span>    <span class="Delimiter">}</span>
 <span id="L53" class="LineNr">53 </span>  <span class="Delimiter">}</span>
 <span id="L54" class="LineNr">54 </span><span class="Delimiter">}</span>
diff --git a/html/subx/034compute_segment_address.cc.html b/html/subx/034compute_segment_address.cc.html
index 53c3ddaa..91ff884d 100644
--- a/html/subx/034compute_segment_address.cc.html
+++ b/html/subx/034compute_segment_address.cc.html
@@ -97,17 +97,17 @@ if ('onhashchange' in window) {
 <span id="L33" class="LineNr"> 33 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!starts_with<span class="Delimiter">(</span>segment_title<span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L34" class="LineNr"> 34 </span>  <span class="Special"><a href='034compute_segment_address.cc.html#L25'>Currently_parsing_named_segment</a></span> =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L24'>Segment_index</a></span><span class="Delimiter">,</span> segment_title<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L36" class="LineNr"> 36 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new segment '&quot;</span> &lt;&lt; segment_title &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L36" class="LineNr"> 36 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new segment '&quot;</span> &lt;&lt; segment_title &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L37" class="LineNr"> 37 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>segment_title == <span class="Constant">&quot;code&quot;</span><span class="Delimiter">)</span>
-<span id="L38" class="LineNr"> 38 </span>      <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L24'>Segment_index</a></span><span class="Delimiter">,</span> segment_title<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L38" class="LineNr"> 38 </span>      <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L24'>Segment_index</a></span><span class="Delimiter">,</span> segment_title<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L39" class="LineNr"> 39 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>segment_title == <span class="Constant">&quot;data&quot;</span><span class="Delimiter">)</span>
-<span id="L40" class="LineNr"> 40 </span>      <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L24'>Segment_index</a></span><span class="Delimiter">,</span> segment_title<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L40" class="LineNr"> 40 </span>      <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L24'>Segment_index</a></span><span class="Delimiter">,</span> segment_title<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L41" class="LineNr"> 41 </span>    <span class="Normal">else</span>
-<span id="L42" class="LineNr"> 42 </span>      <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L24'>Segment_index</a></span><span class="Delimiter">,</span> segment_title<span class="Delimiter">,</span> max<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">)));</span>
+<span id="L42" class="LineNr"> 42 </span>      <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L24'>Segment_index</a></span><span class="Delimiter">,</span> segment_title<span class="Delimiter">,</span> max<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">)));</span>
 <span id="L43" class="LineNr"> 43 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>segment<span class="Delimiter">());</span>
 <span id="L44" class="LineNr"> 44 </span>  <span class="Delimiter">}</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L46" class="LineNr"> 46 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;prepending to segment '&quot;</span> &lt;&lt; segment_title &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L46" class="LineNr"> 46 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;prepending to segment '&quot;</span> &lt;&lt; segment_title &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Delimiter">}</span>
 <span id="L48" class="LineNr"> 48 </span>  <span class="Special"><a href='034compute_segment_address.cc.html#L26'>Currently_parsing_segment_index</a></span> = get<span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L24'>Segment_index</a></span><span class="Delimiter">,</span> segment_title<span class="Delimiter">);</span>
 <span id="L49" class="LineNr"> 49 </span><span class="Delimiter">}</span>
@@ -115,10 +115,10 @@ if ('onhashchange' in window) {
 <span id="L51" class="LineNr"> 51 </span><span class="Delimiter">:(before &quot;End flush(p, lines) Special-cases&quot;)</span>
 <span id="L52" class="LineNr"> 52 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L25'>Currently_parsing_named_segment</a></span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L53" class="LineNr"> 53 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || <span class="Special"><a href='034compute_segment_address.cc.html#L26'>Currently_parsing_segment_index</a></span> &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;input does not start with a '==' section header\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;input does not start with a '==' section header\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L55" class="LineNr"> 55 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L56" class="LineNr"> 56 </span>  <span class="Delimiter">}</span>
-<span id="L57" class="LineNr"> 57 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;flushing to segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L57" class="LineNr"> 57 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;flushing to segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L58" class="LineNr"> 58 </span>  vector&lt;line&gt;&amp; curr_segment_data = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Special"><a href='034compute_segment_address.cc.html#L26'>Currently_parsing_segment_index</a></span><span class="Delimiter">).</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">;</span>
 <span id="L59" class="LineNr"> 59 </span>  curr_segment_data<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>curr_segment_data<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> <a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> <a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span>
 <span id="L60" class="LineNr"> 60 </span>  <a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
@@ -152,13 +152,13 @@ if ('onhashchange' in window) {
 <span id="L88" class="LineNr"> 88 </span>
 <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">:(code)</span>
 <span id="L90" class="LineNr"> 90 </span><span class="Normal">void</span> <a href='034compute_segment_address.cc.html#L90'>compute_segment_starts</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L91" class="LineNr"> 91 </span>  <a href='003trace.cc.html#L203'>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;-- compute segment addresses&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L92" class="LineNr"> 92 </span>  <span class="Normal">uint32_t</span> p_offset = <span class="Comment">/*</span><span class="Comment">size of ehdr</span><span class="Comment">*/</span><span class="Constant">0x34</span> + <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">)</span>*<span class="Constant">0x20</span><span class="Comment">/*</span><span class="Comment">size of each phdr</span><span class="Comment">*/</span><span class="Delimiter">;</span>
+<span id="L91" class="LineNr"> 91 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- compute segment addresses&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="Normal">uint32_t</span> p_offset = <span class="Comment">/*</span><span class="Comment">size of ehdr</span><span class="Comment">*/</span><span class="Constant">0x34</span> + <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">)</span>*<span class="Constant">0x20</span><span class="Comment">/*</span><span class="Comment">size of each phdr</span><span class="Comment">*/</span><span class="Delimiter">;</span>
 <span id="L93" class="LineNr"> 93 </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#L100'>segments</a><span class="Delimiter">.</span>size<span class="Delimiter">();</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L94" class="LineNr"> 94 </span>    segment&amp; curr = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L95" class="LineNr"> 95 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>start == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L96" class="LineNr"> 96 </span>      curr<span class="Delimiter">.</span>start = <a href='012elf.cc.html#L135'>CODE_SEGMENT</a> + i*SPACE_FOR_SEGMENT + p_offset<span class="Delimiter">;</span>
-<span id="L97" class="LineNr"> 97 </span>      <a href='003trace.cc.html#L203'>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 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; curr<span class="Delimiter">.</span>start &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L97" class="LineNr"> 97 </span>      <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;segment &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; begins at address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; curr<span class="Delimiter">.</span>start &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L98" class="LineNr"> 98 </span>    <span class="Delimiter">}</span>
 <span id="L99" class="LineNr"> 99 </span>    p_offset += size_of<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
 <span id="L100" class="LineNr">100 </span>    assert<span class="Delimiter">(</span>p_offset &lt; <a href='010---vm.cc.html#L115'>SEGMENT_ALIGNMENT</a><span class="Delimiter">);</span>  <span class="Comment">// for now we get less and less available space in each successive segment</span>
@@ -167,7 +167,7 @@ if ('onhashchange' in window) {
 <span id="L103" class="LineNr">103 </span>
 <span id="L104" class="LineNr">104 </span><span class="Normal">uint32_t</span> size_of<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L106" class="LineNr">106 </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>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L106" class="LineNr">106 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L107" class="LineNr">107 </span>    sum += <a href='034compute_segment_address.cc.html#L112'>num_bytes</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L108" class="LineNr">108 </span>  <span class="Identifier">return</span> sum<span class="Delimiter">;</span>
 <span id="L109" class="LineNr">109 </span><span class="Delimiter">}</span>
@@ -175,7 +175,7 @@ if ('onhashchange' in window) {
 <span id="L111" class="LineNr">111 </span><span class="Comment">// Assumes all bitfields are packed.</span>
 <span id="L112" class="LineNr">112 </span><span class="Normal">uint32_t</span> <a href='034compute_segment_address.cc.html#L112'>num_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L113" class="LineNr">113 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L114" class="LineNr">114 </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>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L115" class="LineNr">115 </span>    sum += size_of<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L116" class="LineNr">116 </span>  <span class="Identifier">return</span> sum<span class="Delimiter">;</span>
 <span id="L117" class="LineNr">117 </span><span class="Delimiter">}</span>
diff --git a/html/subx/035labels.cc.html b/html/subx/035labels.cc.html
index 6c5f4220..3185ffff 100644
--- a/html/subx/035labels.cc.html
+++ b/html/subx/035labels.cc.html
@@ -85,7 +85,7 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr"> 20 </span><span class="Comment">//: the above rules will remain inviolate.</span>
 <span id="L21" class="LineNr"> 21 </span>
 <span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(before &quot;End looks_like_hex_int(s) Detectors&quot;)</span>
-<span id="L23" class="LineNr"> 23 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">)</span> == <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L23" class="LineNr"> 23 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">)</span> == <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L24" class="LineNr"> 24 </span>
 <span id="L25" class="LineNr"> 25 </span><span class="Delimiter">:(scenarios transform)</span>
 <span id="L26" class="LineNr"> 26 </span><span class="Delimiter">:(scenario pack_immediate_ignores_single_byte_nondigit_operand)</span>
@@ -116,19 +116,19 @@ if ('onhashchange' in window) {
 <span id="L51" class="LineNr"> 51 </span><span class="Delimiter">:(code)</span>
 <span id="L52" class="LineNr"> 52 </span><span class="Normal">void</span> <a href='035labels.cc.html#L52'>check_valid_name</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L53" class="LineNr"> 53 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;empty name!\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;empty name!\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L55" class="LineNr"> 55 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L56" class="LineNr"> 56 </span>  <span class="Delimiter">}</span>
 <span id="L57" class="LineNr"> 57 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> == <span class="Constant">'-'</span><span class="Delimiter">)</span>
-<span id="L58" class="LineNr"> 58 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' starts with '-', which can be confused with a negative number; use a different name\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L58" class="LineNr"> 58 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' starts with '-', which can be confused with a negative number; use a different name\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L59" class="LineNr"> 59 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">)</span> == <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L60" class="LineNr"> 60 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' looks like a hex number; use a different name\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L60" class="LineNr"> 60 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' looks like a hex number; use a different name\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L61" class="LineNr"> 61 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L62" class="LineNr"> 62 </span>  <span class="Delimiter">}</span>
 <span id="L63" class="LineNr"> 63 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>isdigit<span class="Delimiter">(</span>s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span>
-<span id="L64" class="LineNr"> 64 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' starts with a digit, and so can be confused with a negative number; use a different name.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L65" class="LineNr"> 65 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">)</span> == <span class="Constant">2</span><span class="Delimiter">)</span>
-<span id="L66" class="LineNr"> 66 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is two characters long which can look like raw hex bytes at a glance; use a different name\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L64" class="LineNr"> 64 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' starts with a digit, and so can be confused with a negative number; use a different name.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">)</span> == <span class="Constant">2</span><span class="Delimiter">)</span>
+<span id="L66" class="LineNr"> 66 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is two characters long which can look like raw hex bytes at a glance; use a different name\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L67" class="LineNr"> 67 </span><span class="Delimiter">}</span>
 <span id="L68" class="LineNr"> 68 </span>
 <span id="L69" class="LineNr"> 69 </span><span class="Comment">//: Now that that's done, let's start using names as labels.</span>
@@ -143,22 +143,22 @@ if ('onhashchange' in window) {
 <span id="L78" class="LineNr"> 78 </span><span class="Special"><a href='011run.cc.html#L229'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='035labels.cc.html#L80'>rewrite_labels</a><span class="Delimiter">);</span>
 <span id="L79" class="LineNr"> 79 </span><span class="Delimiter">:(code)</span>
 <span id="L80" class="LineNr"> 80 </span><span class="Normal">void</span> <a href='035labels.cc.html#L80'>rewrite_labels</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L81" class="LineNr"> 81 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- rewrite labels&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L81" class="LineNr"> 81 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- rewrite labels&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L82" class="LineNr"> 82 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L83" class="LineNr"> 83 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L84" class="LineNr"> 84 </span>  map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt; byte_index<span class="Delimiter">;</span>  <span class="Comment">// values are unsigned, but we're going to do subtractions on them so they need to fit in 31 bits</span>
 <span id="L85" class="LineNr"> 85 </span>  <a href='035labels.cc.html#L92'>compute_byte_indices_for_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span>
-<span id="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L87" class="LineNr"> 87 </span>  <a href='035labels.cc.html#L153'>drop_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">);</span>
-<span id="L88" class="LineNr"> 88 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L88" class="LineNr"> 88 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L89" class="LineNr"> 89 </span>  <a href='035labels.cc.html#L165'>replace_labels_with_displacements</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span>
 <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">}</span>
 <span id="L91" class="LineNr"> 91 </span>
 <span id="L92" class="LineNr"> 92 </span><span class="Normal">void</span> <a href='035labels.cc.html#L92'>compute_byte_indices_for_labels</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt;&amp; byte_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L93" class="LineNr"> 93 </span>  <span class="Normal">int</span> current_byte = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L94" class="LineNr"> 94 </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#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L95" class="LineNr"> 95 </span>    <span class="Normal">const</span> line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L96" class="LineNr"> 96 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L96" class="LineNr"> 96 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L97" class="LineNr"> 97 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
 <span id="L98" class="LineNr"> 98 </span>      <span class="Comment">// hack: if we have any operand metadata left after previous transforms,</span>
 <span id="L99" class="LineNr"> 99 </span>      <span class="Comment">// deduce its size</span>
@@ -167,12 +167,12 @@ if ('onhashchange' in window) {
 <span id="L102" class="LineNr">102 </span>      <span class="Comment">// have to deal with bitfields.</span>
 <span id="L103" class="LineNr">103 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span> || has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L104" class="LineNr">104 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">)</span>
-<span id="L105" class="LineNr">105 </span>          <a href='003trace.cc.html#L210'>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;': don't use ':' when jumping to labels\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L105" class="LineNr">105 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': don't use ':' when jumping to labels\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L106" class="LineNr">106 </span>        current_byte += <span class="Constant">4</span><span class="Delimiter">;</span>
 <span id="L107" class="LineNr">107 </span>      <span class="Delimiter">}</span>
 <span id="L108" class="LineNr">108 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L109" class="LineNr">109 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">)</span>
-<span id="L110" class="LineNr">110 </span>          <a href='003trace.cc.html#L210'>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;': don't use ':' when jumping to labels\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L110" class="LineNr">110 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': don't use ':' when jumping to labels\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L111" class="LineNr">111 </span>        current_byte += <span class="Constant">2</span><span class="Delimiter">;</span>
 <span id="L112" class="LineNr">112 </span>      <span class="Delimiter">}</span>
 <span id="L113" class="LineNr">113 </span>      <span class="Comment">// automatically handle /disp8 and /imm8 here</span>
@@ -183,15 +183,15 @@ if ('onhashchange' in window) {
 <span id="L118" class="LineNr">118 </span>        string label = <a href='035labels.cc.html#L209'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
 <span id="L119" class="LineNr">119 </span>        <span class="Comment">// ensure labels look sufficiently different from raw hex</span>
 <span id="L120" class="LineNr">120 </span>        <a href='035labels.cc.html#L52'>check_valid_name</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
-<span id="L121" class="LineNr">121 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L121" class="LineNr">121 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L122" class="LineNr">122 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L396'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
-<span id="L123" class="LineNr">123 </span>          <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': label definition (':') not allowed in operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L123" class="LineNr">123 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': label definition (':') not allowed in operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L124" class="LineNr">124 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
-<span id="L125" class="LineNr">125 </span>          <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': labels can only be the first <a href='011run.cc.html#L123'>word</a> in a line.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L125" class="LineNr">125 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': labels can only be the first <a href='011run.cc.html#L123'>word</a> in a line.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L126" class="LineNr">126 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L138'>Map_file</a></span><span class="Delimiter">.</span>is_open<span class="Delimiter">())</span>
 <span id="L127" class="LineNr">127 </span>          <span class="Special"><a href='035labels.cc.html#L138'>Map_file</a></span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>start + current_byte<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">' '</span> &lt;&lt; label &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L128" class="LineNr">128 </span>        <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> label<span class="Delimiter">,</span> current_byte<span class="Delimiter">);</span>
-<span id="L129" class="LineNr">129 </span>        <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' is at address &quot;</span> &lt;&lt; <span class="Delimiter">(</span>current_byte+code<span class="Delimiter">.</span>start<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L128" class="LineNr">128 </span>        <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> label<span class="Delimiter">,</span> current_byte<span class="Delimiter">);</span>
+<span id="L129" class="LineNr">129 </span>        <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' is at address &quot;</span> &lt;&lt; <span class="Delimiter">(</span>current_byte+code<span class="Delimiter">.</span>start<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L130" class="LineNr">130 </span>        <span class="Comment">// no modifying current_byte; label definitions won't be in the final binary</span>
 <span id="L131" class="LineNr">131 </span>      <span class="Delimiter">}</span>
 <span id="L132" class="LineNr">132 </span>    <span class="Delimiter">}</span>
@@ -202,7 +202,7 @@ if ('onhashchange' in window) {
 <span id="L137" class="LineNr">137 </span><span class="Normal">bool</span> <span class="Special"><a href='035labels.cc.html#L137'>Dump_map</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// currently used only by 'subx translate'</span>
 <span id="L138" class="LineNr">138 </span>ofstream <span class="Special"><a href='035labels.cc.html#L138'>Map_file</a></span><span class="Delimiter">;</span>
 <span id="L139" class="LineNr">139 </span><span class="Delimiter">:(before &quot;End Commandline Options&quot;)</span>
-<span id="L140" class="LineNr">140 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--map&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L140" class="LineNr">140 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--map&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L141" class="LineNr">141 </span>  <span class="Special"><a href='035labels.cc.html#L137'>Dump_map</a></span> =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L142" class="LineNr">142 </span>  <span class="Comment">// End --map Settings</span>
 <span id="L143" class="LineNr">143 </span><span class="Delimiter">}</span>
@@ -216,7 +216,7 @@ if ('onhashchange' in window) {
 <span id="L151" class="LineNr">151 </span>
 <span id="L152" class="LineNr">152 </span><span class="Delimiter">:(code)</span>
 <span id="L153" class="LineNr">153 </span><span class="Normal">void</span> <a href='035labels.cc.html#L153'>drop_labels</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L155" class="LineNr">155 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L156" class="LineNr">156 </span>    vector&lt;word&gt;::iterator new_end = remove_if<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>end<span class="Delimiter">(),</span> <a href='035labels.cc.html#L161'>is_label</a><span class="Delimiter">);</span>
 <span id="L157" class="LineNr">157 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>erase<span class="Delimiter">(</span>new_end<span class="Delimiter">,</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span>
@@ -229,23 +229,23 @@ if ('onhashchange' in window) {
 <span id="L164" class="LineNr">164 </span>
 <span id="L165" class="LineNr">165 </span><span class="Normal">void</span> <a href='035labels.cc.html#L165'>replace_labels_with_displacements</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt;&amp; byte_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L166" class="LineNr">166 </span>  <span class="Normal">int32_t</span> byte_index_next_instruction_starts_at = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L167" class="LineNr">167 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L168" class="LineNr">168 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L169" class="LineNr">169 </span>    byte_index_next_instruction_starts_at += <a href='034compute_segment_address.cc.html#L112'>num_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
 <span id="L170" class="LineNr">170 </span>    <a href='011run.cc.html#L117'>line</a> new_inst<span class="Delimiter">;</span>
-<span id="L171" class="LineNr">171 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L171" class="LineNr">171 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L172" class="LineNr">172 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L173" class="LineNr">173 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L247'>contains_key</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L173" class="LineNr">173 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L174" class="LineNr">174 </span>        <span class="Normal">int32_t</span> displacement = <span class="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span>get<span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> - byte_index_next_instruction_starts_at<span class="Delimiter">;</span>
 <span id="L175" class="LineNr">175 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L176" class="LineNr">176 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>displacement &gt; <span class="Constant">0xff</span> || displacement &lt; -<span class="Constant">0x7f</span><span class="Delimiter">)</span>
-<span id="L177" class="LineNr">177 </span>            <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': label too far away for displacement &quot;</span> &lt;&lt; std::hex &lt;&lt; displacement &lt;&lt; <span class="Constant">&quot; to fit in 8 bits\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L177" class="LineNr">177 </span>            <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': label too far away for displacement &quot;</span> &lt;&lt; std::hex &lt;&lt; displacement &lt;&lt; <span class="Constant">&quot; to fit in 8 bits\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L178" class="LineNr">178 </span>          <span class="Normal">else</span>
 <span id="L179" class="LineNr">179 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> displacement<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L180" class="LineNr">180 </span>        <span class="Delimiter">}</span>
 <span id="L181" class="LineNr">181 </span>        <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L182" class="LineNr">182 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>displacement &gt; <span class="Constant">0xffff</span> || displacement &lt; -<span class="Constant">0x7fff</span><span class="Delimiter">)</span>
-<span id="L183" class="LineNr">183 </span>            <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': label too far away for displacement &quot;</span> &lt;&lt; std::hex &lt;&lt; displacement &lt;&lt; <span class="Constant">&quot; to fit in 16 bits\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L183" class="LineNr">183 </span>            <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': label too far away for displacement &quot;</span> &lt;&lt; std::hex &lt;&lt; displacement &lt;&lt; <span class="Constant">&quot; to fit in 16 bits\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L184" class="LineNr">184 </span>          <span class="Normal">else</span>
 <span id="L185" class="LineNr">185 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> displacement<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L186" class="LineNr">186 </span>        <span class="Delimiter">}</span>
@@ -258,13 +258,13 @@ if ('onhashchange' in window) {
 <span id="L193" class="LineNr">193 </span>      <span class="Delimiter">}</span>
 <span id="L194" class="LineNr">194 </span>    <span class="Delimiter">}</span>
 <span id="L195" class="LineNr">195 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
-<span id="L196" class="LineNr">196 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L231'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L196" class="LineNr">196 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L231'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L197" class="LineNr">197 </span>  <span class="Delimiter">}</span>
 <span id="L198" class="LineNr">198 </span><span class="Delimiter">}</span>
 <span id="L199" class="LineNr">199 </span>
 <span id="L200" class="LineNr">200 </span>string <a href='035labels.cc.html#L200'>data_to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L201" class="LineNr">201 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L202" class="LineNr">202 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L202" class="LineNr">202 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L203" class="LineNr">203 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
 <span id="L204" class="LineNr">204 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span>
 <span id="L205" class="LineNr">205 </span>  <span class="Delimiter">}</span>
diff --git a/html/subx/036global_variables.cc.html b/html/subx/036global_variables.cc.html
index d4b2a869..c26d5b53 100644
--- a/html/subx/036global_variables.cc.html
+++ b/html/subx/036global_variables.cc.html
@@ -85,24 +85,24 @@ if ('onhashchange' in window) {
 <span id="L18" class="LineNr"> 18 </span><span class="Special"><a href='011run.cc.html#L229'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='036global_variables.cc.html#L20'>rewrite_global_variables</a><span class="Delimiter">);</span>
 <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(code)</span>
 <span id="L20" class="LineNr"> 20 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L20'>rewrite_global_variables</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- rewrite global variables&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- rewrite global variables&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L22" class="LineNr"> 22 </span>  map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt; address<span class="Delimiter">;</span>
 <span id="L23" class="LineNr"> 23 </span>  compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L25" class="LineNr"> 25 </span>  <a href='036global_variables.cc.html#L60'>drop_global_variables</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
 <span id="L26" class="LineNr"> 26 </span>  <a href='036global_variables.cc.html#L65'>replace_global_variables_with_addresses</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
 <span id="L27" class="LineNr"> 27 </span><span class="Delimiter">}</span>
 <span id="L28" class="LineNr"> 28 </span>
 <span id="L29" class="LineNr"> 29 </span><span class="Normal">void</span> compute_addresses_for_global_variables<span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L30" class="LineNr"> 30 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L31" class="LineNr"> 31 </span>    compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> address<span class="Delimiter">);</span>
 <span id="L32" class="LineNr"> 32 </span><span class="Delimiter">}</span>
 <span id="L33" class="LineNr"> 33 </span>
 <span id="L34" class="LineNr"> 34 </span><span class="Normal">void</span> compute_addresses_for_global_variables<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Normal">int</span> current_address = s<span class="Delimiter">.</span>start<span class="Delimiter">;</span>
-<span id="L36" class="LineNr"> 36 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L36" class="LineNr"> 36 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L37" class="LineNr"> 37 </span>    <span class="Normal">const</span> line&amp; inst = s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L38" class="LineNr"> 38 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L38" class="LineNr"> 38 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L39" class="LineNr"> 39 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
 <span id="L40" class="LineNr"> 40 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L41" class="LineNr"> 41 </span>        current_address += size_of<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
@@ -111,13 +111,13 @@ if ('onhashchange' in window) {
 <span id="L44" class="LineNr"> 44 </span>        string variable = <a href='035labels.cc.html#L209'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
 <span id="L45" class="LineNr"> 45 </span>        <span class="Comment">// ensure variables look sufficiently different from raw hex</span>
 <span id="L46" class="LineNr"> 46 </span>        <a href='035labels.cc.html#L52'>check_valid_name</a><span class="Delimiter">(</span>variable<span class="Delimiter">);</span>
-<span id="L47" class="LineNr"> 47 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L47" class="LineNr"> 47 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L48" class="LineNr"> 48 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
-<span id="L49" class="LineNr"> 49 </span>          <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': global variable names can only be the first <a href='011run.cc.html#L123'>word</a> in a line.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L49" class="LineNr"> 49 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': global variable names can only be the first <a href='011run.cc.html#L123'>word</a> in a line.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L50" class="LineNr"> 50 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L138'>Map_file</a></span><span class="Delimiter">.</span>is_open<span class="Delimiter">())</span>
 <span id="L51" class="LineNr"> 51 </span>          <span class="Special"><a href='035labels.cc.html#L138'>Map_file</a></span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; current_address &lt;&lt; <span class="Constant">' '</span> &lt;&lt; variable &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L52" class="LineNr"> 52 </span>        <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> variable<span class="Delimiter">,</span> current_address<span class="Delimiter">);</span>
-<span id="L53" class="LineNr"> 53 </span>        <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;global variable '&quot;</span> &lt;&lt; variable &lt;&lt; <span class="Constant">&quot;' is at address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; current_address &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L52" class="LineNr"> 52 </span>        <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> variable<span class="Delimiter">,</span> current_address<span class="Delimiter">);</span>
+<span id="L53" class="LineNr"> 53 </span>        <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;global variable '&quot;</span> &lt;&lt; variable &lt;&lt; <span class="Constant">&quot;' is at address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; current_address &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L54" class="LineNr"> 54 </span>        <span class="Comment">// no modifying current_address; global variable definitions won't be in the final binary</span>
 <span id="L55" class="LineNr"> 55 </span>      <span class="Delimiter">}</span>
 <span id="L56" class="LineNr"> 56 </span>    <span class="Delimiter">}</span>
@@ -125,57 +125,57 @@ if ('onhashchange' in window) {
 <span id="L58" class="LineNr"> 58 </span><span class="Delimiter">}</span>
 <span id="L59" class="LineNr"> 59 </span>
 <span id="L60" class="LineNr"> 60 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L60'>drop_global_variables</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L61" class="LineNr"> 61 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L61" class="LineNr"> 61 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L62" class="LineNr"> 62 </span>    <a href='035labels.cc.html#L153'>drop_labels</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L63" class="LineNr"> 63 </span><span class="Delimiter">}</span>
 <span id="L64" class="LineNr"> 64 </span>
 <span id="L65" class="LineNr"> 65 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L65'>replace_global_variables_with_addresses</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L66" class="LineNr"> 66 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L67" class="LineNr"> 67 </span>  <a href='036global_variables.cc.html#L72'>replace_global_variables_in_code_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> address<span class="Delimiter">);</span>
-<span id="L68" class="LineNr"> 68 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a></span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a></span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L69" class="LineNr"> 69 </span>    <a href='036global_variables.cc.html#L95'>replace_global_variables_in_data_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> address<span class="Delimiter">);</span>
 <span id="L70" class="LineNr"> 70 </span><span class="Delimiter">}</span>
 <span id="L71" class="LineNr"> 71 </span>
 <span id="L72" class="LineNr"> 72 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L72'>replace_global_variables_in_code_segment</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L73" class="LineNr"> 73 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L73" class="LineNr"> 73 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L74" class="LineNr"> 74 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L75" class="LineNr"> 75 </span>    <a href='011run.cc.html#L117'>line</a> new_inst<span class="Delimiter">;</span>
-<span id="L76" class="LineNr"> 76 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L76" class="LineNr"> 76 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L77" class="LineNr"> 77 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
 <span id="L78" class="LineNr"> 78 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L79" class="LineNr"> 79 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!looks_like_hex_int<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span>
-<span id="L80" class="LineNr"> 80 </span>          <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;missing reference to global '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L80" class="LineNr"> 80 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;missing reference to global '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L81" class="LineNr"> 81 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
 <span id="L82" class="LineNr"> 82 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L83" class="LineNr"> 83 </span>      <span class="Delimiter">}</span>
 <span id="L84" class="LineNr"> 84 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!valid_use_of_global_variable<span class="Delimiter">(</span>curr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L85" class="LineNr"> 85 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': can't refer to global variable '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L85" class="LineNr"> 85 </span>        <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': can't refer to global variable '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L86" class="LineNr"> 86 </span>        <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L87" class="LineNr"> 87 </span>      <span class="Delimiter">}</span>
 <span id="L88" class="LineNr"> 88 </span>      emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">),</span> <span class="Constant">4</span><span class="Delimiter">);</span>
 <span id="L89" class="LineNr"> 89 </span>    <span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
-<span id="L91" class="LineNr"> 91 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L231'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L91" class="LineNr"> 91 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L231'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Delimiter">}</span>
 <span id="L93" class="LineNr"> 93 </span><span class="Delimiter">}</span>
 <span id="L94" class="LineNr"> 94 </span>
 <span id="L95" class="LineNr"> 95 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L95'>replace_global_variables_in_data_segment</a><span class="Delimiter">(</span>segment&amp; data<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L96" class="LineNr"> 96 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L97" class="LineNr"> 97 </span>    line&amp; l = data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L98" class="LineNr"> 98 </span>    <a href='011run.cc.html#L117'>line</a> new_l<span class="Delimiter">;</span>
-<span id="L99" class="LineNr"> 99 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L99" class="LineNr"> 99 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L100" class="LineNr">100 </span>      <span class="Normal">const</span> word&amp; curr = l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
 <span id="L101" class="LineNr">101 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L102" class="LineNr">102 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!looks_like_hex_int<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span>
-<span id="L103" class="LineNr">103 </span>          <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;missing reference to global '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L103" class="LineNr">103 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;missing reference to global '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L104" class="LineNr">104 </span>        new_l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
 <span id="L105" class="LineNr">105 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L106" class="LineNr">106 </span>      <span class="Delimiter">}</span>
-<span id="L107" class="LineNr">107 </span>      <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot; maps to &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L107" class="LineNr">107 </span>      <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot; maps to &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L108" class="LineNr">108 </span>      emit_hex_bytes<span class="Delimiter">(</span>new_l<span class="Delimiter">,</span> get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">),</span> <span class="Constant">4</span><span class="Delimiter">);</span>
 <span id="L109" class="LineNr">109 </span>    <span class="Delimiter">}</span>
 <span id="L110" class="LineNr">110 </span>    l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
-<span id="L111" class="LineNr">111 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;after <a href='011run.cc.html#L231'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>l<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L111" class="LineNr">111 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;after <a href='011run.cc.html#L231'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>l<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L112" class="LineNr">112 </span>  <span class="Delimiter">}</span>
 <span id="L113" class="LineNr">113 </span><span class="Delimiter">}</span>
 <span id="L114" class="LineNr">114 </span>
@@ -194,9 +194,9 @@ if ('onhashchange' in window) {
 <span id="L127" class="LineNr">127 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L127'>correlate_disp32_with_mod</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L128" class="LineNr">128 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L129" class="LineNr">129 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L130" class="LineNr">130 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L130" class="LineNr">130 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L131" class="LineNr">131 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L132" class="LineNr">132 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L132" class="LineNr">132 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L133" class="LineNr">133 </span>      word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
 <span id="L134" class="LineNr">134 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span>
 <span id="L135" class="LineNr">135 </span>          &amp;&amp; has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">))</span>
@@ -213,7 +213,7 @@ if ('onhashchange' in window) {
 <span id="L146" class="LineNr">146 </span>
 <span id="L147" class="LineNr">147 </span><span class="Delimiter">:(code)</span>
 <span id="L148" class="LineNr">148 </span><span class="Normal">bool</span> <a href='036global_variables.cc.html#L148'>has_metadata</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L150" class="LineNr">150 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> == m<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L151" class="LineNr">151 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L152" class="LineNr">152 </span><span class="Delimiter">}</span>
@@ -274,10 +274,10 @@ if ('onhashchange' in window) {
 <span id="L207" class="LineNr">207 </span><span class="Delimiter">:(code)</span>
 <span id="L208" class="LineNr">208 </span>string to_full_string<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L209" class="LineNr">209 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L211" class="LineNr">211 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
 <span id="L212" class="LineNr">212 </span>    out &lt;&lt; in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span>
-<span id="L213" class="LineNr">213 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
+<span id="L213" class="LineNr">213 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
 <span id="L214" class="LineNr">214 </span>      out &lt;&lt; <span class="Constant">'/'</span> &lt;&lt; in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
 <span id="L215" class="LineNr">215 </span>  <span class="Delimiter">}</span>
 <span id="L216" class="LineNr">216 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
diff --git a/html/subx/038---literal_strings.cc.html b/html/subx/038---literal_strings.cc.html
index 4c9a0391..a66897db 100644
--- a/html/subx/038---literal_strings.cc.html
+++ b/html/subx/038---literal_strings.cc.html
@@ -88,13 +88,13 @@ if ('onhashchange' in window) {
 <span id="L23" class="LineNr"> 23 </span><span class="Normal">int</span> <span class="Special"><a href='038---literal_strings.cc.html#L23'>Next_auto_global</a></span> = <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L24" class="LineNr"> 24 </span><span class="Delimiter">:(code)</span>
 <span id="L25" class="LineNr"> 25 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L25'>transform_literal_strings</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L26" class="LineNr"> 26 </span>  <a href='003trace.cc.html#L203'>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;-- move literal strings to data segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L26" class="LineNr"> 26 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- move literal strings to data segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L27" class="LineNr"> 27 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L28" class="LineNr"> 28 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L29" class="LineNr"> 29 </span>  segment data<span class="Delimiter">;</span>
-<span id="L30" class="LineNr"> 30 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="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#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L31" class="LineNr"> 31 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L32" class="LineNr"> 32 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L32" class="LineNr"> 32 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L33" class="LineNr"> 33 </span>      word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
 <span id="L34" class="LineNr"> 34 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> != <span class="Constant">'&quot;'</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L35" class="LineNr"> 35 </span>      ostringstream global_name<span class="Delimiter">;</span>
@@ -103,10 +103,10 @@ if ('onhashchange' in window) {
 <span id="L38" class="LineNr"> 38 </span>      <a href='038---literal_strings.cc.html#L52'>add_global_to_data_segment</a><span class="Delimiter">(</span>global_name<span class="Delimiter">.</span>str<span class="Delimiter">(),</span> curr<span class="Delimiter">,</span> data<span class="Delimiter">);</span>
 <span id="L39" class="LineNr"> 39 </span>      curr<span class="Delimiter">.</span>data = global_name<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L40" class="LineNr"> 40 </span>    <span class="Delimiter">}</span>
-<span id="L41" class="LineNr"> 41 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L231'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L41" class="LineNr"> 41 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L231'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L42" class="LineNr"> 42 </span>  <span class="Delimiter">}</span>
 <span id="L43" class="LineNr"> 43 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">)</span> &lt; <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">)</span> &lt; <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L45" class="LineNr"> 45 </span>    p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L46" class="LineNr"> 46 </span>    p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Delimiter">}</span>
@@ -115,16 +115,16 @@ if ('onhashchange' in window) {
 <span id="L50" class="LineNr"> 50 </span><span class="Delimiter">}</span>
 <span id="L51" class="LineNr"> 51 </span>
 <span id="L52" class="LineNr"> 52 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L52'>add_global_to_data_segment</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; name<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; value<span class="Delimiter">,</span> segment&amp; data<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L53" class="LineNr"> 53 </span>  <a href='003trace.cc.html#L203'>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;adding global variable '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' containing &quot;</span> &lt;&lt; value<span class="Delimiter">.</span>data &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L53" class="LineNr"> 53 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;adding global variable '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' containing &quot;</span> &lt;&lt; value<span class="Delimiter">.</span>data &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L54" class="LineNr"> 54 </span>  <span class="Comment">// emit label</span>
 <span id="L55" class="LineNr"> 55 </span>  data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>label<span class="Delimiter">(</span>name<span class="Delimiter">));</span>
 <span id="L56" class="LineNr"> 56 </span>  <span class="Comment">// emit size for size-prefixed array</span>
 <span id="L57" class="LineNr"> 57 </span>  data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L117'>line</a><span class="Delimiter">());</span>
-<span id="L58" class="LineNr"> 58 </span>  emit_hex_bytes<span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>back<span class="Delimiter">(),</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>value<span class="Delimiter">.</span>data<span class="Delimiter">)</span>-<span class="Comment">/*</span><span class="Comment">skip quotes</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Comment">/*</span><span class="Comment">bytes</span><span class="Comment">*/</span><span class="Delimiter">);</span>
+<span id="L58" class="LineNr"> 58 </span>  emit_hex_bytes<span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>back<span class="Delimiter">(),</span> <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>value<span class="Delimiter">.</span>data<span class="Delimiter">)</span>-<span class="Comment">/*</span><span class="Comment">skip quotes</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Comment">/*</span><span class="Comment">bytes</span><span class="Comment">*/</span><span class="Delimiter">);</span>
 <span id="L59" class="LineNr"> 59 </span>  <span class="Comment">// emit data byte by byte</span>
 <span id="L60" class="LineNr"> 60 </span>  data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L117'>line</a><span class="Delimiter">());</span>
 <span id="L61" class="LineNr"> 61 </span>  line&amp; curr = data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>back<span class="Delimiter">();</span>
-<span id="L62" class="LineNr"> 62 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip start quote</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>value<span class="Delimiter">.</span>data<span class="Delimiter">)</span>-<span class="Comment">/*</span><span class="Comment">skip end quote</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip start quote</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>value<span class="Delimiter">.</span>data<span class="Delimiter">)</span>-<span class="Comment">/*</span><span class="Comment">skip end quote</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L63" class="LineNr"> 63 </span>    <span class="Normal">char</span> c = value<span class="Delimiter">.</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L64" class="LineNr"> 64 </span>    curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span>
 <span id="L65" class="LineNr"> 65 </span>    curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <a href='030---operands.cc.html#L286'>hex_byte_to_string</a><span class="Delimiter">(</span>c<span class="Delimiter">);</span>
@@ -160,7 +160,7 @@ if ('onhashchange' in window) {
 <span id="L95" class="LineNr"> 95 </span><span class="Delimiter">:(code)</span>
 <span id="L96" class="LineNr"> 96 </span><span class="Normal">void</span> parse_instruction_character_by_character<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; line_data<span class="Delimiter">,</span> vector&lt;line&gt;&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L97" class="LineNr"> 97 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>line_data<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="cSpecial">'\n'</span><span class="Delimiter">)</span> != string::npos  &amp;&amp; line_data<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="cSpecial">'\n'</span><span class="Delimiter">)</span> != line_data<span class="Delimiter">.</span>size<span class="Delimiter">()</span>-<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L98" class="LineNr"> 98 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;parse_instruction_character_by_character: should receive only a single line\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L98" class="LineNr"> 98 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;parse_instruction_character_by_character: should receive only a single line\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L99" class="LineNr"> 99 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L100" class="LineNr">100 </span>  <span class="Delimiter">}</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Comment">// parse literals</span>
@@ -168,7 +168,7 @@ if ('onhashchange' in window) {
 <span id="L103" class="LineNr">103 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
 <span id="L104" class="LineNr">104 </span>  <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Comment">// add tokens (words or strings) one by one</span>
-<span id="L106" class="LineNr">106 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L106" class="LineNr">106 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L107" class="LineNr">107 </span>    <a href='038---literal_strings.cc.html#L158'>skip_whitespace</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L108" class="LineNr">108 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L109" class="LineNr">109 </span>    <span class="Normal">char</span> c = in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
@@ -184,7 +184,7 @@ if ('onhashchange' in window) {
 <span id="L119" class="LineNr">119 </span>      <span class="Comment">// slurp word data</span>
 <span id="L120" class="LineNr">120 </span>      ostringstream d<span class="Delimiter">;</span>
 <span id="L121" class="LineNr">121 </span>      d &lt;&lt; c<span class="Delimiter">;</span>
-<span id="L122" class="LineNr">122 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L122" class="LineNr">122 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L123" class="LineNr">123 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
 <span id="L124" class="LineNr">124 </span>        d &lt;&lt; c<span class="Delimiter">;</span>
 <span id="L125" class="LineNr">125 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'&quot;'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -192,7 +192,7 @@ if ('onhashchange' in window) {
 <span id="L127" class="LineNr">127 </span>      result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = d<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L128" class="LineNr">128 </span>      <span class="Comment">// slurp metadata</span>
 <span id="L129" class="LineNr">129 </span>      ostringstream m<span class="Delimiter">;</span>
-<span id="L130" class="LineNr">130 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> &amp;&amp; <a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L130" class="LineNr">130 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> &amp;&amp; <a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L131" class="LineNr">131 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
 <span id="L132" class="LineNr">132 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'/'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L133" class="LineNr">133 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>!m<span class="Delimiter">.</span>str<span class="Delimiter">().</span>empty<span class="Delimiter">())</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>m<span class="Delimiter">.</span>str<span class="Delimiter">());</span>
@@ -208,13 +208,13 @@ if ('onhashchange' in window) {
 <span id="L143" class="LineNr">143 </span>      <span class="Comment">// slurp all characters until whitespace</span>
 <span id="L144" class="LineNr">144 </span>      ostringstream w<span class="Delimiter">;</span>
 <span id="L145" class="LineNr">145 </span>      w &lt;&lt; c<span class="Delimiter">;</span>
-<span id="L146" class="LineNr">146 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> &amp;&amp; <a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// peek can sometimes trigger eof(), so do it first</span>
+<span id="L146" class="LineNr">146 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> &amp;&amp; <a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// peek can sometimes trigger eof(), so do it first</span>
 <span id="L147" class="LineNr">147 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
 <span id="L148" class="LineNr">148 </span>        w &lt;&lt; c<span class="Delimiter">;</span>
 <span id="L149" class="LineNr">149 </span>      <span class="Delimiter">}</span>
 <span id="L150" class="LineNr">150 </span>      <a href='011run.cc.html#L191'>parse_word</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>str<span class="Delimiter">(),</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span>
 <span id="L151" class="LineNr">151 </span>    <span class="Delimiter">}</span>
-<span id="L152" class="LineNr">152 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;word: &quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">())</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L152" class="LineNr">152 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;word: &quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">())</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L153" class="LineNr">153 </span>  <span class="Delimiter">}</span>
 <span id="L154" class="LineNr">154 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
 <span id="L155" class="LineNr">155 </span>    out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>result<span class="Delimiter">);</span>
@@ -222,15 +222,15 @@ if ('onhashchange' in window) {
 <span id="L157" class="LineNr">157 </span>
 <span id="L158" class="LineNr">158 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L158'>skip_whitespace</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L159" class="LineNr">159 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L160" class="LineNr">160 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L160" class="LineNr">160 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
 <span id="L161" class="LineNr">161 </span>    <span class="Normal">else</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L162" class="LineNr">162 </span>  <span class="Delimiter">}</span>
 <span id="L163" class="LineNr">163 </span><span class="Delimiter">}</span>
 <span id="L164" class="LineNr">164 </span>
 <span id="L165" class="LineNr">165 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L165'>skip_comment</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L166" class="LineNr">166 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L167" class="LineNr">167 </span>    in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L168" class="LineNr">168 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L168" class="LineNr">168 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
 <span id="L169" class="LineNr">169 </span>  <span class="Delimiter">}</span>
 <span id="L170" class="LineNr">170 </span><span class="Delimiter">}</span>
 <span id="L171" class="LineNr">171 </span>
@@ -294,7 +294,7 @@ if ('onhashchange' in window) {
 <span id="L229" class="LineNr">229 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
 <span id="L230" class="LineNr">230 </span>      <span class="Constant">&quot;68/push \&quot;</span>test\<span class="Constant">&quot;/f&quot;</span>  <span class="Comment">// no newline, which is how calls from parse() will look</span>
 <span id="L231" class="LineNr">231 </span>  <span class="Delimiter">);</span>
-<span id="L232" class="LineNr">232 </span>  <a href='003trace.cc.html#L257'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L232" class="LineNr">232 </span>  <a href='003trace.cc.html#L233'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
 <span id="L233" class="LineNr">233 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L123'>word</a>: 68 /push^D&quot;</span>
 <span id="L234" class="LineNr">234 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L123'>word</a>: \&quot;</span>test\<span class="Constant">&quot; /f^D&quot;</span>
 <span id="L235" class="LineNr">235 </span>  <span class="Delimiter">);</span>
diff --git a/html/subx/039debug.cc.html b/html/subx/039debug.cc.html
index 7e66bad2..e8883fd0 100644
--- a/html/subx/039debug.cc.html
+++ b/html/subx/039debug.cc.html
@@ -72,18 +72,18 @@ if ('onhashchange' in window) {
 <span id="L11" class="LineNr">11 </span><span class="Normal">void</span> <a href='039debug.cc.html#L11'>load_map</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; map_filename<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L12" class="LineNr">12 </span>  ifstream fin<span class="Delimiter">(</span>map_filename<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
 <span id="L13" class="LineNr">13 </span>  fin &gt;&gt; std::hex<span class="Delimiter">;</span>
-<span id="L14" class="LineNr">14 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L14" class="LineNr">14 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L15" class="LineNr">15 </span>    <span class="Normal">uint32_t</span> addr = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L16" class="LineNr">16 </span>    fin &gt;&gt; addr<span class="Delimiter">;</span>
 <span id="L17" class="LineNr">17 </span>    string name<span class="Delimiter">;</span>
 <span id="L18" class="LineNr">18 </span>    fin &gt;&gt; name<span class="Delimiter">;</span>
-<span id="L19" class="LineNr">19 </span>    <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> addr<span class="Delimiter">,</span> name<span class="Delimiter">);</span>
+<span id="L19" class="LineNr">19 </span>    <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> addr<span class="Delimiter">,</span> name<span class="Delimiter">);</span>
 <span id="L20" class="LineNr">20 </span>  <span class="Delimiter">}</span>
 <span id="L21" class="LineNr">21 </span><span class="Delimiter">}</span>
 <span id="L22" class="LineNr">22 </span>
 <span id="L23" class="LineNr">23 </span><span class="Delimiter">:(after &quot;Run One Instruction&quot;)</span>
-<span id="L24" class="LineNr">24 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L247'>contains_key</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">))</span>
-<span id="L25" class="LineNr">25 </span>  <a href='003trace.cc.html#L203'>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;== label &quot;</span> &lt;&lt; get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L24" class="LineNr">24 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">))</span>
+<span id="L25" class="LineNr">25 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;== label &quot;</span> &lt;&lt; get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/040---tests.cc.html b/html/subx/040---tests.cc.html
index f00d27e4..886bff17 100644
--- a/html/subx/040---tests.cc.html
+++ b/html/subx/040---tests.cc.html
@@ -97,11 +97,11 @@ if ('onhashchange' in window) {
 <span id="L32" class="LineNr">32 </span><span class="Normal">void</span> create_test_function<span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L33" class="LineNr">33 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L34" class="LineNr">34 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L35" class="LineNr">35 </span>  <a href='003trace.cc.html#L203'>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;-- create 'run-tests'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L35" class="LineNr">35 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- create 'run-tests'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L36" class="LineNr">36 </span>  vector&lt;line&gt; <a href='040---tests.cc.html#L36'>new_insts</a><span class="Delimiter">;</span>
-<span id="L37" class="LineNr">37 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L37" class="LineNr">37 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L38" class="LineNr">38 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L39" class="LineNr">39 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L39" class="LineNr">39 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L40" class="LineNr">40 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
 <span id="L41" class="LineNr">41 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// not a label</span>
 <span id="L42" class="LineNr">42 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!starts_with<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">&quot;test-&quot;</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
@@ -117,9 +117,9 @@ if ('onhashchange' in window) {
 <span id="L52" class="LineNr">52 </span>
 <span id="L53" class="LineNr">53 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L54" class="LineNr">54 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L55" class="LineNr">55 </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>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L55" class="LineNr">55 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L56" class="LineNr">56 </span>    <span class="Normal">const</span> line&amp; l = s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L57" class="LineNr">57 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L57" class="LineNr">57 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L58" class="LineNr">58 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
 <span id="L59" class="LineNr">59 </span>      out &lt;&lt; to_string<span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span>
 <span id="L60" class="LineNr">60 </span>    <span class="Delimiter">}</span>
diff --git a/html/subx/052kernel_string_equal.subx.html b/html/subx/052kernel_string_equal.subx.html
index b6b1c974..518337ae 100644
--- a/html/subx/052kernel_string_equal.subx.html
+++ b/html/subx/052kernel_string_equal.subx.html
@@ -24,7 +24,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .subxS1Comment { color:#2d8cff; }
 .CommentedCode { color: #6c6c6c; }
 .subxFunction { color: #ff8700; }
-.subxTest { color: #00af00; }
+.subxTest { color: #5f8700; }
 .Constant { color:#00a0a0; }
 .SpecialChar { color: #ff0000; }
 .subxH1Comment { color:#00ffff; }
diff --git a/html/subx/054string_equal.subx.html b/html/subx/054string_equal.subx.html
index 15c1d4c7..fe037a9e 100644
--- a/html/subx/054string_equal.subx.html
+++ b/html/subx/054string_equal.subx.html
@@ -24,7 +24,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .subxS1Comment { color:#2d8cff; }
 .CommentedCode { color: #6c6c6c; }
 .subxFunction { color: #ff8700; }
-.subxTest { color: #00af00; }
+.subxTest { color: #5f8700; }
 .Constant { color:#00a0a0; }
 .SpecialChar { color: #ff0000; }
 .subxH1Comment { color:#00ffff; }
diff --git a/html/subx/055trace.subx.html b/html/subx/055trace.subx.html
index f9a25505..71f74d16 100644
--- a/html/subx/055trace.subx.html
+++ b/html/subx/055trace.subx.html
@@ -24,7 +24,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .subxS1Comment { color:#2d8cff; }
 .SpecialChar { color: #ff0000; }
 .subxFunction { color: #ff8700; }
-.subxTest { color: #00af00; }
+.subxTest { color: #5f8700; }
 .subxMinorFunction { color: #875f5f; }
 .Constant { color:#00a0a0; }
 .CommentedCode { color: #6c6c6c; }
diff --git a/html/subx/056write.subx.html b/html/subx/056write.subx.html
index 442c7eff..f26e80f5 100644
--- a/html/subx/056write.subx.html
+++ b/html/subx/056write.subx.html
@@ -24,7 +24,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .subxS1Comment { color:#2d8cff; }
 .CommentedCode { color: #6c6c6c; }
 .subxFunction { color: #ff8700; }
-.subxTest { color: #00af00; }
+.subxTest { color: #5f8700; }
 .subxMinorFunction { color: #875f5f; }
 .Constant { color:#00a0a0; }
 .SpecialChar { color: #ff0000; }
diff --git a/html/subx/057stop.subx.html b/html/subx/057stop.subx.html
index f4c9e361..cc58ac3e 100644
--- a/html/subx/057stop.subx.html
+++ b/html/subx/057stop.subx.html
@@ -24,7 +24,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .subxS1Comment { color:#2d8cff; }
 .CommentedCode { color: #6c6c6c; }
 .subxFunction { color: #ff8700; }
-.subxTest { color: #00af00; }
+.subxTest { color: #5f8700; }
 .subxMinorFunction { color: #875f5f; }
 .Constant { color:#00a0a0; }
 .SpecialChar { color: #ff0000; }
diff --git a/html/subx/058read.subx.html b/html/subx/058read.subx.html
index c80afd2e..8c0eb1d2 100644
--- a/html/subx/058read.subx.html
+++ b/html/subx/058read.subx.html
@@ -24,7 +24,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .subxS1Comment { color:#2d8cff; }
 .CommentedCode { color: #6c6c6c; }
 .subxFunction { color: #ff8700; }
-.subxTest { color: #00af00; }
+.subxTest { color: #5f8700; }
 .subxMinorFunction { color: #875f5f; }
 .Constant { color:#00a0a0; }
 .SpecialChar { color: #ff0000; }
diff --git a/html/subx/059read-byte.subx.html b/html/subx/059read-byte.subx.html
index 7c5b55fa..27c745cd 100644
--- a/html/subx/059read-byte.subx.html
+++ b/html/subx/059read-byte.subx.html
@@ -24,7 +24,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .subxS1Comment { color:#2d8cff; }
 .SpecialChar { color: #ff0000; }
 .subxFunction { color: #ff8700; }
-.subxTest { color: #00af00; }
+.subxTest { color: #5f8700; }
 .subxMinorFunction { color: #875f5f; }
 .Constant { color:#00a0a0; }
 .CommentedCode { color: #6c6c6c; }
diff --git a/html/subx/060write-stream.subx.html b/html/subx/060write-stream.subx.html
index 5f400f04..a6fa89be 100644
--- a/html/subx/060write-stream.subx.html
+++ b/html/subx/060write-stream.subx.html
@@ -24,7 +24,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .subxS1Comment { color:#2d8cff; }
 .CommentedCode { color: #6c6c6c; }
 .subxFunction { color: #ff8700; }
-.subxTest { color: #00af00; }
+.subxTest { color: #5f8700; }
 .subxMinorFunction { color: #875f5f; }
 .Constant { color:#00a0a0; }
 .SpecialChar { color: #ff0000; }
diff --git a/html/subx/062write-byte.subx.html b/html/subx/062write-byte.subx.html
index cb9ba347..16ec1aa8 100644
--- a/html/subx/062write-byte.subx.html
+++ b/html/subx/062write-byte.subx.html
@@ -24,7 +24,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .subxS1Comment { color:#2d8cff; }
 .SpecialChar { color: #ff0000; }
 .subxFunction { color: #ff8700; }
-.subxTest { color: #00af00; }
+.subxTest { color: #5f8700; }
 .Constant { color:#00a0a0; }
 .CommentedCode { color: #6c6c6c; }
 .subxH1Comment { color:#00ffff; }
diff --git a/html/subx/063print-byte.subx.html b/html/subx/063print-byte.subx.html
index eb445da7..1e32a216 100644
--- a/html/subx/063print-byte.subx.html
+++ b/html/subx/063print-byte.subx.html
@@ -24,7 +24,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .subxS1Comment { color:#2d8cff; }
 .CommentedCode { color: #6c6c6c; }
 .subxFunction { color: #ff8700; }
-.subxTest { color: #00af00; }
+.subxTest { color: #5f8700; }
 .Constant { color:#00a0a0; }
 .SpecialChar { color: #ff0000; }
 .subxH1Comment { color:#00ffff; }
diff --git a/html/subx/064write-buffered.subx.html b/html/subx/064write-buffered.subx.html
index c87ecb79..d63983f6 100644
--- a/html/subx/064write-buffered.subx.html
+++ b/html/subx/064write-buffered.subx.html
@@ -24,7 +24,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .subxS1Comment { color:#2d8cff; }
 .CommentedCode { color: #6c6c6c; }
 .subxFunction { color: #ff8700; }
-.subxTest { color: #00af00; }
+.subxTest { color: #5f8700; }
 .Constant { color:#00a0a0; }
 .SpecialChar { color: #ff0000; }
 .subxH1Comment { color:#00ffff; }
diff --git a/html/subx/apps/crenshaw2-1.subx.html b/html/subx/apps/crenshaw2-1.subx.html
index 44b0ac02..5372b93c 100644
--- a/html/subx/apps/crenshaw2-1.subx.html
+++ b/html/subx/apps/crenshaw2-1.subx.html
@@ -26,7 +26,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .Constant { color:#00a0a0; }
 .subxFunction { color: #ff8700; }
 .subxMinorFunction { color: #875f5f; }
-.subxTest { color: #00af00; }
+.subxTest { color: #5f8700; }
 .SpecialChar { color: #ff0000; }
 .subxH1Comment { color:#00ffff; }
 -->
diff --git a/html/subx/apps/crenshaw2-1b.subx.html b/html/subx/apps/crenshaw2-1b.subx.html
index 3d5196a2..37e36821 100644
--- a/html/subx/apps/crenshaw2-1b.subx.html
+++ b/html/subx/apps/crenshaw2-1b.subx.html
@@ -26,7 +26,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .Constant { color:#00a0a0; }
 .subxFunction { color: #ff8700; }
 .subxMinorFunction { color: #875f5f; }
-.subxTest { color: #00af00; }
+.subxTest { color: #5f8700; }
 .SpecialChar { color: #ff0000; }
 .subxH1Comment { color:#00ffff; }
 -->
diff --git a/html/subx/apps/factorial.subx.html b/html/subx/apps/factorial.subx.html
index 87a467fa..8383b297 100644
--- a/html/subx/apps/factorial.subx.html
+++ b/html/subx/apps/factorial.subx.html
@@ -25,7 +25,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .CommentedCode { color: #6c6c6c; }
 .Constant { color:#00a0a0; }
 .subxFunction { color: #ff8700; }
-.subxTest { color: #00af00; }
+.subxTest { color: #5f8700; }
 .SpecialChar { color: #ff0000; }
 .subxH1Comment { color:#00ffff; }
 -->
diff --git a/html/subx/apps/hex.subx.html b/html/subx/apps/hex.subx.html
index 928b233e..a97b1f11 100644
--- a/html/subx/apps/hex.subx.html
+++ b/html/subx/apps/hex.subx.html
@@ -26,7 +26,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .Constant { color:#00a0a0; }
 .subxFunction { color: #ff8700; }
 .subxMinorFunction { color: #875f5f; }
-.subxTest { color: #00af00; }
+.subxTest { color: #5f8700; }
 .SpecialChar { color: #ff0000; }
 .subxH1Comment { color:#00ffff; }
 -->
diff --git a/html/subx/examples/ex11.subx.html b/html/subx/examples/ex11.subx.html
index ba1add8f..289d23c7 100644
--- a/html/subx/examples/ex11.subx.html
+++ b/html/subx/examples/ex11.subx.html
@@ -24,7 +24,7 @@ body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color:
 .subxS1Comment { color:#2d8cff; }
 .CommentedCode { color: #6c6c6c; }
 .subxFunction { color: #ff8700; }
-.subxTest { color: #00af00; }
+.subxTest { color: #5f8700; }
 .Constant { color:#00a0a0; }
 .SpecialChar { color: #ff0000; }
 .subxH1Comment { color:#00ffff; }