about summary refs log tree commit diff stats
path: root/html
diff options
context:
space:
mode:
Diffstat (limited to 'html')
-rw-r--r--html/subx/000organization.cc.html2
-rw-r--r--html/subx/003trace.cc.html66
-rw-r--r--html/subx/011run.cc.html413
-rw-r--r--html/subx/013direct_addressing.cc.html1080
-rw-r--r--html/subx/014indirect_addressing.cc.html57
-rw-r--r--html/subx/015immediate_addressing.cc.html20
-rw-r--r--html/subx/016index_addressing.cc.html6
-rw-r--r--html/subx/019functions.cc.html4
-rw-r--r--html/subx/028translate.cc.html4
-rw-r--r--html/subx/030---operands.cc.html26
-rw-r--r--html/subx/031check_operands.cc.html650
-rw-r--r--html/subx/032check_operand_bounds.cc.html4
-rw-r--r--html/subx/034compute_segment_address.cc.html2
-rw-r--r--html/subx/035labels.cc.html278
-rw-r--r--html/subx/036global_variables.cc.html10
-rw-r--r--html/subx/038---literal_strings.cc.html281
-rw-r--r--html/subx/040---tests.cc.html190
-rw-r--r--html/subx/apps/crenshaw2-1.subx.html272
-rw-r--r--html/subx/apps/factorial.subx.html372
-rw-r--r--html/subx/examples/ex10.subx.html4
-rw-r--r--html/subx/examples/ex11.subx.html364
-rw-r--r--html/subx/examples/ex5.subx.html64
-rw-r--r--html/subx/examples/ex8.subx.html70
-rw-r--r--html/subx/examples/ex9.subx.html6
24 files changed, 2497 insertions, 1748 deletions
diff --git a/html/subx/000organization.cc.html b/html/subx/000organization.cc.html
index 10d753e9..e3e2abb4 100644
--- a/html/subx/000organization.cc.html
+++ b/html/subx/000organization.cc.html
@@ -169,7 +169,7 @@ if ('onhashchange' in window) {
 <span id="L110" class="LineNr">110 </span><span class="Comment">//</span>
 <span id="L111" class="LineNr">111 </span><span class="Comment">// End Globals</span>
 <span id="L112" class="LineNr">112 </span>
-<span id="L113" class="LineNr">113 </span><span class="Normal">int</span> main<span class="Delimiter">(</span><span class="Normal">int</span> argc<span class="Delimiter">,</span> <span class="Normal">char</span>* argv[]<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L113" class="LineNr">113 </span><span class="Normal">int</span> <a href='000organization.cc.html#L113'>main</a><span class="Delimiter">(</span><span class="Normal">int</span> argc<span class="Delimiter">,</span> <span class="Normal">char</span>* argv[]<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L114" class="LineNr">114 </span>  atexit<span class="Delimiter">(</span><a href='000organization.cc.html#L148'>reset</a><span class="Delimiter">);</span>
 <span id="L115" class="LineNr">115 </span>  <span class="Comment">// we require a 32-bit little-endian system</span>
 <span id="L116" class="LineNr">116 </span>  assert<span class="Delimiter">(</span><span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">int</span><span class="Delimiter">)</span> == <span class="Constant">4</span><span class="Delimiter">);</span>
diff --git a/html/subx/003trace.cc.html b/html/subx/003trace.cc.html
index 6abc7086..9e3c7c6c 100644
--- a/html/subx/003trace.cc.html
+++ b/html/subx/003trace.cc.html
@@ -129,10 +129,10 @@ if ('onhashchange' in window) {
 <span id="L70" class="LineNr"> 70 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
 <span id="L71" class="LineNr"> 71 </span><span class="Normal">struct</span> trace_line <span class="Delimiter">{</span>
 <span id="L72" class="LineNr"> 72 </span>  <span class="Normal">int</span> <a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">;</span>  <span class="Comment">// optional field just to help browse traces later</span>
-<span id="L73" class="LineNr"> 73 </span>  string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">;</span>
+<span id="L73" class="LineNr"> 73 </span>  string label<span class="Delimiter">;</span>
 <span id="L74" class="LineNr"> 74 </span>  string <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">;</span>
-<span id="L75" class="LineNr"> 75 </span>  trace_line<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><span class="Constant">0</span><span class="Delimiter">),</span> <a href='003trace.cc.html#L73'>label</a><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="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> <a href='003trace.cc.html#L73'>label</a><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="L75" class="LineNr"> 75 </span>  trace_line<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><span class="Constant">0</span><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="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>
@@ -176,14 +176,14 @@ if ('onhashchange' in window) {
 <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><a href='003trace.cc.html#L105'>Max_depth</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L115'>collect_depth</a><span class="Delimiter">(</span><a href='003trace.cc.html#L105'>Max_depth</a><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="L119" class="LineNr">119 </span>
-<span id="L120" class="LineNr">120 </span>  ostream&amp; stream<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><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><a href='003trace.cc.html#L105'>Max_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</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><a href='003trace.cc.html#L105'>Max_depth</a><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 <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</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> = <a href='003trace.cc.html#L73'>label</a><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>
@@ -199,7 +199,7 @@ if ('onhashchange' in window) {
 <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 <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>  <span class="Comment">// empty label = show everything</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>
@@ -220,12 +220,12 @@ if ('onhashchange' in window) {
 <span id="L161" class="LineNr">161 </span>  <a href='003trace.cc.html#L114'>curr_depth</a> = <a href='003trace.cc.html#L105'>Max_depth</a><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 <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</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>  <a href='003trace.cc.html#L73'>label</a> = <a href='003trace.cc.html#L391'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>
+<span id="L166" class="LineNr">166 </span>  label = <a href='003trace.cc.html#L391'>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><a href='003trace.cc.html#L222'>end</a><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><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || <a href='003trace.cc.html#L73'>label</a> == p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="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><a href='003trace.cc.html#L73'>label</a> &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="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 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="Delimiter">}</span>
 <span id="L171" class="LineNr">171 </span>  <span class="Identifier">return</span> output<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L172" class="LineNr">172 </span><span class="Delimiter">}</span>
@@ -318,10 +318,10 @@ if ('onhashchange' in window) {
 <span id="L259" class="LineNr">259 </span>  <span class="Delimiter">}</span>
 <span id="L260" class="LineNr">260 </span>
 <span id="L261" class="LineNr">261 </span><span class="Comment">#define CHECK_TRACE_COUNT(label, count) \</span>
-<span id="L262" class="LineNr">262 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> &amp;&amp; trace_count<span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> != <span class="Delimiter">(</span>count<span class="Delimiter">))</span> <span class="Delimiter">{</span> \
-<span id="L263" class="LineNr">263 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span> &lt;&lt; __FUNCTION__ &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="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; <a href='003trace.cc.html#L73'>label</a> &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="L264" class="LineNr">264 </span>    cerr &lt;&lt; <span class="Constant">&quot;  got &quot;</span> &lt;&lt; trace_count<span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><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="L265" class="LineNr">265 </span>    <a href='003trace.cc.html#L200'>DUMP</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span> \
+<span id="L262" class="LineNr">262 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> &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="L263" class="LineNr">263 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span> &lt;&lt; __FUNCTION__ &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="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="L264" class="LineNr">264 </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="L265" class="LineNr">265 </span>    <a href='003trace.cc.html#L200'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span> \
 <span id="L266" class="LineNr">266 </span>    <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
 <span id="L267" class="LineNr">267 </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="L268" class="LineNr">268 </span>  <span class="Delimiter">}</span>
@@ -337,10 +337,10 @@ if ('onhashchange' in window) {
 <span id="L278" class="LineNr">278 </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="L279" class="LineNr">279 </span>    ++curr_expected_line<span class="Delimiter">;</span>
 <span id="L280" class="LineNr">280 </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="L281" class="LineNr">281 </span>  string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">;</span>
+<span id="L281" class="LineNr">281 </span>  string label<span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">;</span>
 <span id="L282" class="LineNr">282 </span>  <a href='003trace.cc.html#L305'>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="L283" class="LineNr">283 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L284" class="LineNr">284 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a> != p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L284" class="LineNr">284 </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="L285" class="LineNr">285 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> != <a href='003trace.cc.html#L391'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Identifier">continue</span><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">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>
@@ -349,19 +349,19 @@ if ('onhashchange' in window) {
 <span id="L290" class="LineNr">290 </span>    <a href='003trace.cc.html#L305'>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="L291" class="LineNr">291 </span>  <span class="Delimiter">}</span>
 <span id="L292" class="LineNr">292 </span>
-<span id="L293" class="LineNr">293 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L318'>line_exists_anywhere</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L294" class="LineNr">294 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span> &lt;&lt; FUNCTION &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Normal">FILE</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; LINE &lt;&lt; <span class="Constant">&quot;): <a href='011run.cc.html#L117'>line</a> [&quot;</span> &lt;&lt; <a href='003trace.cc.html#L73'>label</a> &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='003trace.cc.html#L74'>contents</a> &lt;&lt; <span class="Constant">&quot;] out of order in <a href='003trace.cc.html#L196'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L293" class="LineNr">293 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L318'>line_exists_anywhere</a><span class="Delimiter">(</span>label<span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L294" class="LineNr">294 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span> &lt;&lt; FUNCTION &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Normal">FILE</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; LINE &lt;&lt; <span class="Constant">&quot;): <a href='011run.cc.html#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#L196'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L295" class="LineNr">295 </span>    <a href='003trace.cc.html#L200'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L296" class="LineNr">296 </span>  <span class="Delimiter">}</span>
 <span id="L297" class="LineNr">297 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L298" class="LineNr">298 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span> &lt;&lt; FUNCTION &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Normal">FILE</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; LINE &lt;&lt; <span class="Constant">&quot;): 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#L196'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L299" class="LineNr">299 </span>    <a href='003trace.cc.html#L200'>DUMP</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>
+<span id="L299" class="LineNr">299 </span>    <a href='003trace.cc.html#L200'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
 <span id="L300" class="LineNr">300 </span>  <span class="Delimiter">}</span>
 <span id="L301" class="LineNr">301 </span>  <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L302" class="LineNr">302 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L303" class="LineNr">303 </span><span class="Delimiter">}</span>
 <span id="L304" class="LineNr">304 </span>
-<span id="L305" class="LineNr">305 </span><span class="Normal">void</span> <a href='003trace.cc.html#L305'>split_label_contents</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">,</span> string* <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> string* <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L305" class="LineNr">305 </span><span class="Normal">void</span> <a href='003trace.cc.html#L305'>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="L306" class="LineNr">306 </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="L307" class="LineNr">307 </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="L308" class="LineNr">308 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -374,23 +374,23 @@ if ('onhashchange' in window) {
 <span id="L315" class="LineNr">315 </span>  <span class="Delimiter">}</span>
 <span id="L316" class="LineNr">316 </span><span class="Delimiter">}</span>
 <span id="L317" class="LineNr">317 </span>
-<span id="L318" class="LineNr">318 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L318'>line_exists_anywhere</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; <a href='003trace.cc.html#L73'>label</a><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="L318" class="LineNr">318 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L318'>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="L319" class="LineNr">319 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L320" class="LineNr">320 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a> != p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L320" class="LineNr">320 </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="L321" class="LineNr">321 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> == <a href='003trace.cc.html#L391'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L322" class="LineNr">322 </span>  <span class="Delimiter">}</span>
 <span id="L323" class="LineNr">323 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L324" class="LineNr">324 </span><span class="Delimiter">}</span>
 <span id="L325" class="LineNr">325 </span>
-<span id="L326" class="LineNr">326 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L327" class="LineNr">327 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L326" class="LineNr">326 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L327" class="LineNr">327 </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="L328" class="LineNr">328 </span><span class="Delimiter">}</span>
 <span id="L329" class="LineNr">329 </span>
-<span id="L330" class="LineNr">330 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> string <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L330" class="LineNr">330 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L331" class="LineNr">331 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L332" class="LineNr">332 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L333" class="LineNr">333 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L334" class="LineNr">334 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a> == p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L334" class="LineNr">334 </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="L335" class="LineNr">335 </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#L391'>trim</a><span class="Delimiter">(</span><a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> == <a href='003trace.cc.html#L391'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span>
 <span id="L336" class="LineNr">336 </span>        ++result<span class="Delimiter">;</span>
 <span id="L337" class="LineNr">337 </span>    <span class="Delimiter">}</span>
@@ -398,11 +398,11 @@ if ('onhashchange' in window) {
 <span id="L339" class="LineNr">339 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L340" class="LineNr">340 </span><span class="Delimiter">}</span>
 <span id="L341" class="LineNr">341 </span>
-<span id="L342" class="LineNr">342 </span><span class="Normal">int</span> <a href='003trace.cc.html#L342'>trace_count_prefix</a><span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> string prefix<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L342" class="LineNr">342 </span><span class="Normal">int</span> <a href='003trace.cc.html#L342'>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="L343" class="LineNr">343 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L344" class="LineNr">344 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L345" class="LineNr">345 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L346" class="LineNr">346 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a> == p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L346" class="LineNr">346 </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="L347" class="LineNr">347 </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#L391'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L391'>trim</a><span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span>
 <span id="L348" class="LineNr">348 </span>        ++result<span class="Delimiter">;</span>
 <span id="L349" class="LineNr">349 </span>    <span class="Delimiter">}</span>
@@ -410,14 +410,14 @@ if ('onhashchange' in window) {
 <span id="L351" class="LineNr">351 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L352" class="LineNr">352 </span><span class="Delimiter">}</span>
 <span id="L353" class="LineNr">353 </span>
-<span id="L354" class="LineNr">354 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> string <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L355" class="LineNr">355 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L354" class="LineNr">354 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L355" class="LineNr">355 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>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="L356" class="LineNr">356 </span><span class="Delimiter">}</span>
 <span id="L357" class="LineNr">357 </span>
 <span id="L358" class="LineNr">358 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L359" class="LineNr">359 </span>  vector&lt;string&gt; tmp = <a href='003trace.cc.html#L382'>split_first</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
 <span id="L360" class="LineNr">360 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>tmp<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L361" class="LineNr">361 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; expected &lt;&lt; <span class="Constant">&quot;: missing <a href='003trace.cc.html#L73'>label</a> or <a href='003trace.cc.html#L74'>contents</a> in <a href='003trace.cc.html#L196'>trace</a> <a href='011run.cc.html#L117'>line</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L361" class="LineNr">361 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; expected &lt;&lt; <span class="Constant">&quot;: missing label or <a href='003trace.cc.html#L74'>contents</a> in <a href='003trace.cc.html#L196'>trace</a> <a href='011run.cc.html#L117'>line</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L362" class="LineNr">362 </span>    assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
 <span id="L363" class="LineNr">363 </span>  <span class="Delimiter">}</span>
 <span id="L364" class="LineNr">364 </span>  <span class="Identifier">return</span> trace_doesnt_contain<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
diff --git a/html/subx/011run.cc.html b/html/subx/011run.cc.html
index ef265021..0428490f 100644
--- a/html/subx/011run.cc.html
+++ b/html/subx/011run.cc.html
@@ -148,9 +148,9 @@ if ('onhashchange' in window) {
 <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>  <a href='011run.cc.html#L132'>parse</a><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#L217'>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#L196'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L88" class="LineNr"> 88 </span>  <a href='011run.cc.html#L209'>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#L217'>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#L205'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L90" class="LineNr"> 90 </span>  <a href='011run.cc.html#L218'>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#L217'>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; <a href='010---vm.cc.html#L95'>End_of_program</a><span class="Delimiter">)</span>
 <span id="L93" class="LineNr"> 93 </span>    <a href='010---vm.cc.html#L150'>run_one_instruction</a><span class="Delimiter">();</span>
@@ -201,206 +201,219 @@ if ('onhashchange' in window) {
 <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#L196'>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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L141" class="LineNr">141 </span>    istringstream lin<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span>
-<span id="L142" class="LineNr">142 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>has_data</a><span class="Delimiter">(</span>lin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L143" class="LineNr">143 </span>      string word_data<span class="Delimiter">;</span>
-<span id="L144" class="LineNr">144 </span>      lin &gt;&gt; word_data<span class="Delimiter">;</span>
-<span id="L145" class="LineNr">145 </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>
-<span id="L146" class="LineNr">146 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data[<span class="Constant">0</span>] == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// comment</span>
-<span id="L147" class="LineNr">147 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data == <span class="Constant">&quot;.&quot;</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// comment token</span>
-<span id="L148" class="LineNr">148 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data == <span class="Constant">&quot;==&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L149" class="LineNr">149 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!l<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L150" class="LineNr">150 </span>          assert<span class="Delimiter">(</span>!out<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L151" class="LineNr">151 </span>          <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L152" class="LineNr">152 </span>          out<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>l<span class="Delimiter">);</span>
-<span id="L153" class="LineNr">153 </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>        string segment_title<span class="Delimiter">;</span>
-<span id="L156" class="LineNr">156 </span>        lin &gt;&gt; segment_title<span class="Delimiter">;</span>
-<span id="L157" class="LineNr">157 </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 id="L158" class="LineNr">158 </span>          s<span class="Delimiter">.</span><a href='011run.cc.html#L108'>start</a> = <a href='011run.cc.html#L311'>parse_int</a><span class="Delimiter">(</span>segment_title<span class="Delimiter">);</span>
-<span id="L159" class="LineNr">159 </span>        <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new segment from &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; s<span class="Delimiter">.</span><a href='011run.cc.html#L108'>start</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L160" class="LineNr">160 </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="L161" class="LineNr">161 </span>        <span class="Comment">// todo?</span>
-<span id="L162" class="LineNr">162 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// skip rest of line</span>
-<span id="L163" class="LineNr">163 </span>      <span class="Delimiter">}</span>
-<span id="L164" class="LineNr">164 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data[<span class="Constant">0</span>] == <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L165" class="LineNr">165 </span>        <span class="Comment">// todo: line metadata</span>
-<span id="L166" class="LineNr">166 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L167" class="LineNr">167 </span>      <span class="Delimiter">}</span>
-<span id="L168" class="LineNr">168 </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="L169" class="LineNr">169 </span>      curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>original = word_data<span class="Delimiter">;</span>
-<span id="L170" class="LineNr">170 </span>      istringstream win<span class="Delimiter">(</span>word_data<span class="Delimiter">);</span>
-<span id="L171" class="LineNr">171 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>getline<span class="Delimiter">(</span>win<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><a href='011run.cc.html#L125'>data</a><span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L172" class="LineNr">172 </span>        string m<span class="Delimiter">;</span>
-<span id="L173" class="LineNr">173 </span>        <span class="Normal">while</span> <span class="Delimiter">(</span>getline<span class="Delimiter">(</span>win<span class="Delimiter">,</span> m<span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">))</span>
-<span id="L174" class="LineNr">174 </span>          curr<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>
-<span id="L175" class="LineNr">175 </span>      <span class="Delimiter">}</span>
-<span id="L176" class="LineNr">176 </span>      <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new <a href='011run.cc.html#L123'>word</a>: &quot;</span> &lt;&lt; curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L125'>data</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L177" class="LineNr">177 </span>    <span class="Delimiter">}</span>
-<span id="L178" class="LineNr">178 </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="L179" class="LineNr">179 </span>      l<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<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#L260'>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>
+<span id="L147" class="LineNr">147 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data[<span class="Constant">0</span>] == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// comment</span>
+<span id="L148" class="LineNr">148 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data == <span class="Constant">&quot;.&quot;</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// comment token</span>
+<span id="L149" class="LineNr">149 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data == <span class="Constant">&quot;==&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L150" class="LineNr">150 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!l<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L151" class="LineNr">151 </span>          assert<span class="Delimiter">(</span>!out<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L152" class="LineNr">152 </span>          <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L153" class="LineNr">153 </span>          out<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>l<span class="Delimiter">);</span>
+<span id="L154" class="LineNr">154 </span>        <span class="Delimiter">}</span>
+<span id="L155" class="LineNr">155 </span>        segment s<span class="Delimiter">;</span>
+<span id="L156" class="LineNr">156 </span>        string segment_title<span class="Delimiter">;</span>
+<span id="L157" class="LineNr">157 </span>        lin &gt;&gt; segment_title<span class="Delimiter">;</span>
+<span id="L158" class="LineNr">158 </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 id="L159" class="LineNr">159 </span>          s<span class="Delimiter">.</span><a href='011run.cc.html#L108'>start</a> = <a href='011run.cc.html#L324'>parse_int</a><span class="Delimiter">(</span>segment_title<span class="Delimiter">);</span>
+<span id="L160" class="LineNr">160 </span>        <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new segment from &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; s<span class="Delimiter">.</span><a href='011run.cc.html#L108'>start</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L161" class="LineNr">161 </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="L162" class="LineNr">162 </span>        <span class="Comment">// todo?</span>
+<span id="L163" class="LineNr">163 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// skip rest of line</span>
+<span id="L164" class="LineNr">164 </span>      <span class="Delimiter">}</span>
+<span id="L165" class="LineNr">165 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data[<span class="Constant">0</span>] == <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L166" class="LineNr">166 </span>        <span class="Comment">// todo: line metadata</span>
+<span id="L167" class="LineNr">167 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L168" class="LineNr">168 </span>      <span class="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#L184'>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#L196'>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>  <span class="Normal">if</span> <span class="Delimiter">(</span>!l<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L177" class="LineNr">177 </span>    assert<span class="Delimiter">(</span>!out<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L178" class="LineNr">178 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;flushing to segment&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L179" class="LineNr">179 </span>    out<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>l<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">if</span> <span class="Delimiter">(</span>!l<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L182" class="LineNr">182 </span>    assert<span class="Delimiter">(</span>!out<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L183" class="LineNr">183 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;flushing to segment&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L184" class="LineNr">184 </span>    out<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>l<span class="Delimiter">);</span>
-<span id="L185" class="LineNr">185 </span>  <span class="Delimiter">}</span>
-<span id="L186" class="LineNr">186 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L187" class="LineNr">187 </span><span class="Delimiter">}</span>
-<span id="L188" class="LineNr">188 </span>
-<span id="L189" class="LineNr">189 </span><span class="SalientComment">//:: transform</span>
-<span id="L190" class="LineNr">190 </span>
-<span id="L191" class="LineNr">191 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L192" class="LineNr">192 </span><span class="Normal">typedef</span> <span class="Normal">void</span> <span class="Delimiter">(</span>*transform_fn<span class="Delimiter">)(</span>program&amp;<span class="Delimiter">);</span>
-<span id="L193" class="LineNr">193 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L194" class="LineNr">194 </span>vector&lt;transform_fn&gt; <a href='011run.cc.html#L194'>Transform</a><span class="Delimiter">;</span>
-<span id="L195" class="LineNr">195 </span>
-<span id="L196" class="LineNr">196 </span><span class="Normal">void</span> <a href='011run.cc.html#L196'>transform</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L197" class="LineNr">197 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L198" class="LineNr">198 </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><a href='011run.cc.html#L194'>Transform</a><span class="Delimiter">);</span>  ++t<span class="Delimiter">)</span>
-<span id="L199" class="LineNr">199 </span>    <span class="Delimiter">(</span>*Transform<span class="Delimiter">.</span>at<span class="Delimiter">(</span>t<span class="Delimiter">))(</span>p<span class="Delimiter">);</span>
-<span id="L200" class="LineNr">200 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L201" class="LineNr">201 </span><span class="Delimiter">}</span>
-<span id="L202" class="LineNr">202 </span>
-<span id="L203" class="LineNr">203 </span><span class="SalientComment">//:: load</span>
-<span id="L204" class="LineNr">204 </span>
-<span id="L205" class="LineNr">205 </span><span class="Normal">void</span> <a href='011run.cc.html#L205'>load</a><span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L206" class="LineNr">206 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L207" class="LineNr">207 </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="L208" class="LineNr">208 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;no <a href='031check_operands.cc.html#L14'>code</a> to <a href='011run.cc.html#L83'>run</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L209" class="LineNr">209 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Delimiter">}</span>
-<span id="L211" class="LineNr">211 </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="L212" class="LineNr">212 </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="L213" class="LineNr">213 </span>    <span class="Normal">uint32_t</span> addr = seg<span class="Delimiter">.</span><a href='011run.cc.html#L108'>start</a><span class="Delimiter">;</span>
-<span id="L214" class="LineNr">214 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;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#L260'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L215" class="LineNr">215 </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="L216" class="LineNr">216 </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="L217" class="LineNr">217 </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="L218" class="LineNr">218 </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="L219" class="LineNr">219 </span>        <span class="Normal">uint8_t</span> val = <a href='011run.cc.html#L232'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
-<span id="L220" class="LineNr">220 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L221" class="LineNr">221 </span>        <a href='010---vm.cc.html#L133'>write_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
-<span id="L222" class="LineNr">222 </span>        <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L259'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L104'>read_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L223" class="LineNr">223 </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>i == <span class="Constant">0</span><span class="Delimiter">)</span> <a href='010---vm.cc.html#L95'>End_of_program</a> = addr<span class="Delimiter">;</span>
-<span id="L227" class="LineNr">227 </span>  <span class="Delimiter">}</span>
-<span id="L228" class="LineNr">228 </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><a href='011run.cc.html#L108'>start</a><span class="Delimiter">;</span>
-<span id="L229" class="LineNr">229 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L230" class="LineNr">230 </span><span class="Delimiter">}</span>
-<span id="L231" class="LineNr">231 </span>
-<span id="L232" class="LineNr">232 </span><span class="Normal">uint8_t</span> <a href='011run.cc.html#L232'>hex_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L233" class="LineNr">233 </span>  istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
-<span id="L234" class="LineNr">234 </span>  <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L235" class="LineNr">235 </span>  in &gt;&gt; std::hex &gt;&gt; result<span class="Delimiter">;</span>
-<span id="L236" class="LineNr">236 </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="L237" class="LineNr">237 </span>    <a href='003trace.cc.html#L203'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L238" class="LineNr">238 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
-<span id="L239" class="LineNr">239 </span>  <span class="Delimiter">}</span>
-<span id="L240" class="LineNr">240 </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="L241" class="LineNr">241 </span>    <a href='003trace.cc.html#L203'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L242" class="LineNr">242 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
-<span id="L243" class="LineNr">243 </span>  <span class="Delimiter">}</span>
-<span id="L244" class="LineNr">244 </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>
-<span id="L245" class="LineNr">245 </span><span class="Delimiter">}</span>
-<span id="L246" class="LineNr">246 </span>
-<span id="L247" class="LineNr">247 </span><span class="Delimiter">:(scenarios parse_and_load)</span>
-<span id="L248" class="LineNr">248 </span><span class="Delimiter">:(scenario number_too_large)</span>
-<span id="L249" class="LineNr">249 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L250" class="LineNr">250 </span>== <span class="Constant">0x1</span>
-<span id="L251" class="LineNr">251 </span><span class="PreProc">0</span><span class="Constant">5</span> cab
-<span id="L252" class="LineNr">252 </span><span class="traceContains">+error: token 'cab' is not a hex byte</span>
-<span id="L253" class="LineNr">253 </span>
-<span id="L254" class="LineNr">254 </span><span class="Delimiter">:(scenario invalid_hex)</span>
-<span id="L255" class="LineNr">255 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L256" class="LineNr">256 </span>== <span class="Constant">0x1</span>
-<span id="L257" class="LineNr">257 </span><span class="PreProc">0</span><span class="Constant">5</span> cx
-<span id="L258" class="LineNr">258 </span><span class="traceContains">+error: token 'cx' is not a hex byte</span>
+<span id="L181" class="LineNr">181 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L182" class="LineNr">182 </span><span class="Delimiter">}</span>
+<span id="L183" class="LineNr">183 </span>
+<span id="L184" class="LineNr">184 </span><span class="Normal">void</span> <a href='011run.cc.html#L184'>parse_word</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; <a href='011run.cc.html#L125'>data</a><span class="Delimiter">,</span> word&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L185" class="LineNr">185 </span>  out<span class="Delimiter">.</span>original = <a href='011run.cc.html#L125'>data</a><span class="Delimiter">;</span>
+<span id="L186" class="LineNr">186 </span>  istringstream win<span class="Delimiter">(</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>getline<span class="Delimiter">(</span>win<span class="Delimiter">,</span> out<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L188" class="LineNr">188 </span>    string m<span class="Delimiter">;</span>
+<span id="L189" class="LineNr">189 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span>getline<span class="Delimiter">(</span>win<span class="Delimiter">,</span> m<span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">))</span>
+<span id="L190" class="LineNr">190 </span>      out<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>m<span class="Delimiter">);</span>
+<span id="L191" class="LineNr">191 </span>  <span class="Delimiter">}</span>
+<span id="L192" class="LineNr">192 </span><span class="Delimiter">}</span>
+<span id="L193" class="LineNr">193 </span>
+<span id="L194" class="LineNr">194 </span>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="L195" class="LineNr">195 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L196" class="LineNr">196 </span>  out &lt;&lt; w<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">;</span>
+<span id="L197" class="LineNr">197 </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="L198" class="LineNr">198 </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="L199" class="LineNr">199 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L200" class="LineNr">200 </span><span class="Delimiter">}</span>
+<span id="L201" class="LineNr">201 </span>
+<span id="L202" class="LineNr">202 </span><span class="SalientComment">//:: transform</span>
+<span id="L203" class="LineNr">203 </span>
+<span id="L204" class="LineNr">204 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L205" class="LineNr">205 </span><span class="Normal">typedef</span> <span class="Normal">void</span> <span class="Delimiter">(</span>*transform_fn<span class="Delimiter">)(</span>program&amp;<span class="Delimiter">);</span>
+<span id="L206" class="LineNr">206 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L207" class="LineNr">207 </span>vector&lt;transform_fn&gt; <a href='011run.cc.html#L207'>Transform</a><span class="Delimiter">;</span>
+<span id="L208" class="LineNr">208 </span>
+<span id="L209" class="LineNr">209 </span><span class="Normal">void</span> <a href='011run.cc.html#L209'>transform</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L210" class="LineNr">210 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L211" class="LineNr">211 </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><a href='011run.cc.html#L207'>Transform</a><span class="Delimiter">);</span>  ++t<span class="Delimiter">)</span>
+<span id="L212" class="LineNr">212 </span>    <span class="Delimiter">(</span>*Transform<span class="Delimiter">.</span>at<span class="Delimiter">(</span>t<span class="Delimiter">))(</span>p<span class="Delimiter">);</span>
+<span id="L213" class="LineNr">213 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><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="SalientComment">//:: load</span>
+<span id="L217" class="LineNr">217 </span>
+<span id="L218" class="LineNr">218 </span><span class="Normal">void</span> <a href='011run.cc.html#L218'>load</a><span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L219" class="LineNr">219 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L220" class="LineNr">220 </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="L221" class="LineNr">221 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;no <a href='031check_operands.cc.html#L14'>code</a> to <a href='011run.cc.html#L83'>run</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L222" class="LineNr">222 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L223" class="LineNr">223 </span>  <span class="Delimiter">}</span>
+<span id="L224" class="LineNr">224 </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="L225" class="LineNr">225 </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="L226" class="LineNr">226 </span>    <span class="Normal">uint32_t</span> addr = seg<span class="Delimiter">.</span><a href='011run.cc.html#L108'>start</a><span class="Delimiter">;</span>
+<span id="L227" class="LineNr">227 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;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#L260'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L228" class="LineNr">228 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#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="L229" class="LineNr">229 </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="L230" class="LineNr">230 </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="L231" class="LineNr">231 </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="L232" class="LineNr">232 </span>        <span class="Normal">uint8_t</span> val = <a href='011run.cc.html#L245'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L233" class="LineNr">233 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L234" class="LineNr">234 </span>        <a href='010---vm.cc.html#L133'>write_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
+<span id="L235" class="LineNr">235 </span>        <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L259'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L104'>read_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L236" class="LineNr">236 </span>        ++addr<span class="Delimiter">;</span>
+<span id="L237" class="LineNr">237 </span>      <span class="Delimiter">}</span>
+<span id="L238" class="LineNr">238 </span>    <span class="Delimiter">}</span>
+<span id="L239" class="LineNr">239 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> <a href='010---vm.cc.html#L95'>End_of_program</a> = addr<span class="Delimiter">;</span>
+<span id="L240" class="LineNr">240 </span>  <span class="Delimiter">}</span>
+<span id="L241" class="LineNr">241 </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><a href='011run.cc.html#L108'>start</a><span class="Delimiter">;</span>
+<span id="L242" class="LineNr">242 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L243" class="LineNr">243 </span><span class="Delimiter">}</span>
+<span id="L244" class="LineNr">244 </span>
+<span id="L245" class="LineNr">245 </span><span class="Normal">uint8_t</span> <a href='011run.cc.html#L245'>hex_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L246" class="LineNr">246 </span>  istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L247" class="LineNr">247 </span>  <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L248" class="LineNr">248 </span>  in &gt;&gt; std::hex &gt;&gt; result<span class="Delimiter">;</span>
+<span id="L249" class="LineNr">249 </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="L250" class="LineNr">250 </span>    <a href='003trace.cc.html#L203'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L251" class="LineNr">251 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><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">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="L254" class="LineNr">254 </span>    <a href='003trace.cc.html#L203'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L255" class="LineNr">255 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
+<span id="L256" class="LineNr">256 </span>  <span class="Delimiter">}</span>
+<span id="L257" class="LineNr">257 </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>
+<span id="L258" class="LineNr">258 </span><span class="Delimiter">}</span>
 <span id="L259" class="LineNr">259 </span>
-<span id="L260" class="LineNr">260 </span><span class="Delimiter">:(scenario negative_number)</span>
-<span id="L261" class="LineNr">261 </span>== <span class="Constant">0x1</span>
-<span id="L262" class="LineNr">262 </span><span class="PreProc">0</span><span class="Constant">5</span> -<span class="Constant">12</span>
-<span id="L263" class="LineNr">263 </span>$error: <span class="Constant">0</span>
-<span id="L264" class="LineNr">264 </span>
-<span id="L265" class="LineNr">265 </span><span class="Delimiter">:(scenario negative_number_too_small)</span>
-<span id="L266" class="LineNr">266 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L267" class="LineNr">267 </span>== <span class="Constant">0x1</span>
-<span id="L268" class="LineNr">268 </span><span class="PreProc">0</span><span class="Constant">5</span> -<span class="Constant">12345</span>
-<span id="L269" class="LineNr">269 </span><span class="traceContains">+error: token '-12345' is not a hex byte</span>
-<span id="L270" class="LineNr">270 </span>
-<span id="L271" class="LineNr">271 </span><span class="Delimiter">:(scenario hex_prefix)</span>
-<span id="L272" class="LineNr">272 </span>== <span class="Constant">0x1</span>
-<span id="L273" class="LineNr">273 </span><span class="Constant">0x05</span> -<span class="Constant">0x12</span>
-<span id="L274" class="LineNr">274 </span>$error: <span class="Constant">0</span>
-<span id="L275" class="LineNr">275 </span>
-<span id="L276" class="LineNr">276 </span><span class="Comment">//: helper for tests</span>
-<span id="L277" class="LineNr">277 </span><span class="Delimiter">:(code)</span>
-<span id="L278" class="LineNr">278 </span><span class="Normal">void</span> <a href='011run.cc.html#L278'>parse_and_load</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L279" class="LineNr">279 </span>  <a href='011run.cc.html#L99'>program</a> p<span class="Delimiter">;</span>
-<span id="L280" class="LineNr">280 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
-<span id="L281" class="LineNr">281 </span>  <a href='011run.cc.html#L132'>parse</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L282" class="LineNr">282 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// if any stage raises errors, stop immediately</span>
-<span id="L283" class="LineNr">283 </span>  <a href='011run.cc.html#L205'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L284" class="LineNr">284 </span><span class="Delimiter">}</span>
-<span id="L285" class="LineNr">285 </span>
-<span id="L286" class="LineNr">286 </span><span class="SalientComment">//:: run</span>
-<span id="L287" class="LineNr">287 </span>
-<span id="L288" class="LineNr">288 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L289" class="LineNr">289 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add imm32 to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L290" class="LineNr">290 </span>
-<span id="L291" class="LineNr">291 </span><span class="Comment">//: our first opcode</span>
-<span id="L292" class="LineNr">292 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L293" class="LineNr">293 </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="L294" class="LineNr">294 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L302'>next32</a><span class="Delimiter">();</span>
-<span id="L295" class="LineNr">295 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to <a href='010---vm.cc.html#L23'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L296" class="LineNr">296 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L297" class="LineNr">297 </span>  <span class="Identifier">break</span><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="Delimiter">:(code)</span>
-<span id="L301" class="LineNr">301 </span><span class="Comment">// read a 32-bit int in little-endian order from the instruction stream</span>
-<span id="L302" class="LineNr">302 </span><span class="Normal">int32_t</span> <a href='011run.cc.html#L302'>next32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L303" class="LineNr">303 </span>  <span class="Normal">int32_t</span> result = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L304" class="LineNr">304 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
-<span id="L305" class="LineNr">305 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
-<span id="L306" class="LineNr">306 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">24</span><span class="Delimiter">);</span>
-<span id="L307" class="LineNr">307 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L308" class="LineNr">308 </span><span class="Delimiter">}</span>
-<span id="L309" class="LineNr">309 </span>
-<span id="L310" class="LineNr">310 </span><span class="Delimiter">:(code)</span>
-<span id="L311" class="LineNr">311 </span><span class="Normal">int32_t</span> <a href='011run.cc.html#L311'>parse_int</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L312" class="LineNr">312 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L313" class="LineNr">313 </span>  istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
-<span id="L314" class="LineNr">314 </span>  in &gt;&gt; std::hex<span class="Delimiter">;</span>
-<span id="L315" class="LineNr">315 </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 class="Delimiter">{</span>
-<span id="L316" class="LineNr">316 </span>    <span class="Normal">int32_t</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L317" class="LineNr">317 </span>    in &gt;&gt; result<span class="Delimiter">;</span>
-<span id="L318" class="LineNr">318 </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="L319" class="LineNr">319 </span>      <a href='003trace.cc.html#L203'>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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L320" class="LineNr">320 </span>      <span class="Identifier">return</span> <span class="Constant">0</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 class="Normal">uint32_t</span> uresult = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L325" class="LineNr">325 </span>  in &gt;&gt; uresult<span class="Delimiter">;</span>
-<span id="L326" class="LineNr">326 </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="L327" class="LineNr">327 </span>    <a href='003trace.cc.html#L203'>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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L328" class="LineNr">328 </span>    <span class="Identifier">return</span> <span class="Constant">0</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="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span>uresult<span class="Delimiter">);</span>
-<span id="L331" class="LineNr">331 </span><span class="Delimiter">}</span>
-<span id="L332" class="LineNr">332 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
-<span id="L333" class="LineNr">333 </span><span class="Normal">void</span> <a href='011run.cc.html#L333'>test_parse_int</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L334" class="LineNr">334 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='011run.cc.html#L311'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0&quot;</span><span class="Delimiter">));</span>
-<span id="L335" class="LineNr">335 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='011run.cc.html#L311'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0x0&quot;</span><span class="Delimiter">));</span>
-<span id="L336" class="LineNr">336 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='011run.cc.html#L311'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0x0&quot;</span><span class="Delimiter">));</span>
-<span id="L337" class="LineNr">337 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">16</span><span class="Delimiter">,</span> <a href='011run.cc.html#L311'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;10&quot;</span><span class="Delimiter">));</span>  <span class="Comment">// hex always</span>
-<span id="L338" class="LineNr">338 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>-<span class="Constant">1</span><span class="Delimiter">,</span> <a href='011run.cc.html#L311'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;-1&quot;</span><span class="Delimiter">));</span>
-<span id="L339" class="LineNr">339 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>-<span class="Constant">1</span><span class="Delimiter">,</span> <a href='011run.cc.html#L311'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0xffffffff&quot;</span><span class="Delimiter">));</span>
-<span id="L340" class="LineNr">340 </span><span class="Delimiter">}</span>
+<span id="L260" class="LineNr">260 </span><span class="Delimiter">:(scenarios parse_and_load)</span>
+<span id="L261" class="LineNr">261 </span><span class="Delimiter">:(scenario number_too_large)</span>
+<span id="L262" class="LineNr">262 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L263" class="LineNr">263 </span>== <span class="Constant">0x1</span>
+<span id="L264" class="LineNr">264 </span><span class="PreProc">0</span><span class="Constant">5</span> cab
+<span id="L265" class="LineNr">265 </span><span class="traceContains">+error: token 'cab' is not a hex byte</span>
+<span id="L266" class="LineNr">266 </span>
+<span id="L267" class="LineNr">267 </span><span class="Delimiter">:(scenario invalid_hex)</span>
+<span id="L268" class="LineNr">268 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L269" class="LineNr">269 </span>== <span class="Constant">0x1</span>
+<span id="L270" class="LineNr">270 </span><span class="PreProc">0</span><span class="Constant">5</span> cx
+<span id="L271" class="LineNr">271 </span><span class="traceContains">+error: token 'cx' is not a hex byte</span>
+<span id="L272" class="LineNr">272 </span>
+<span id="L273" class="LineNr">273 </span><span class="Delimiter">:(scenario negative_number)</span>
+<span id="L274" class="LineNr">274 </span>== <span class="Constant">0x1</span>
+<span id="L275" class="LineNr">275 </span><span class="PreProc">0</span><span class="Constant">5</span> -<span class="Constant">12</span>
+<span id="L276" class="LineNr">276 </span>$error: <span class="Constant">0</span>
+<span id="L277" class="LineNr">277 </span>
+<span id="L278" class="LineNr">278 </span><span class="Delimiter">:(scenario negative_number_too_small)</span>
+<span id="L279" class="LineNr">279 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L280" class="LineNr">280 </span>== <span class="Constant">0x1</span>
+<span id="L281" class="LineNr">281 </span><span class="PreProc">0</span><span class="Constant">5</span> -<span class="Constant">12345</span>
+<span id="L282" class="LineNr">282 </span><span class="traceContains">+error: token '-12345' is not a hex byte</span>
+<span id="L283" class="LineNr">283 </span>
+<span id="L284" class="LineNr">284 </span><span class="Delimiter">:(scenario hex_prefix)</span>
+<span id="L285" class="LineNr">285 </span>== <span class="Constant">0x1</span>
+<span id="L286" class="LineNr">286 </span><span class="Constant">0x05</span> -<span class="Constant">0x12</span>
+<span id="L287" class="LineNr">287 </span>$error: <span class="Constant">0</span>
+<span id="L288" class="LineNr">288 </span>
+<span id="L289" class="LineNr">289 </span><span class="Comment">//: helper for tests</span>
+<span id="L290" class="LineNr">290 </span><span class="Delimiter">:(code)</span>
+<span id="L291" class="LineNr">291 </span><span class="Normal">void</span> <a href='011run.cc.html#L291'>parse_and_load</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L292" class="LineNr">292 </span>  <a href='011run.cc.html#L99'>program</a> p<span class="Delimiter">;</span>
+<span id="L293" class="LineNr">293 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
+<span id="L294" class="LineNr">294 </span>  <a href='011run.cc.html#L132'>parse</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// if any stage raises errors, stop immediately</span>
+<span id="L296" class="LineNr">296 </span>  <a href='011run.cc.html#L218'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L297" class="LineNr">297 </span><span class="Delimiter">}</span>
+<span id="L298" class="LineNr">298 </span>
+<span id="L299" class="LineNr">299 </span><span class="SalientComment">//:: run</span>
+<span id="L300" class="LineNr">300 </span>
+<span id="L301" class="LineNr">301 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L302" class="LineNr">302 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add imm32 to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L303" class="LineNr">303 </span>
+<span id="L304" class="LineNr">304 </span><span class="Comment">//: our first opcode</span>
+<span id="L305" class="LineNr">305 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L306" class="LineNr">306 </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="L307" class="LineNr">307 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L315'>next32</a><span class="Delimiter">();</span>
+<span id="L308" class="LineNr">308 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to <a href='010---vm.cc.html#L23'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L309" class="LineNr">309 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L310" class="LineNr">310 </span>  <span class="Identifier">break</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="Delimiter">:(code)</span>
+<span id="L314" class="LineNr">314 </span><span class="Comment">// read a 32-bit int in little-endian order from the instruction stream</span>
+<span id="L315" class="LineNr">315 </span><span class="Normal">int32_t</span> <a href='011run.cc.html#L315'>next32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L316" class="LineNr">316 </span>  <span class="Normal">int32_t</span> result = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L317" class="LineNr">317 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L318" class="LineNr">318 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
+<span id="L319" class="LineNr">319 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">24</span><span class="Delimiter">);</span>
+<span id="L320" class="LineNr">320 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L321" class="LineNr">321 </span><span class="Delimiter">}</span>
+<span id="L322" class="LineNr">322 </span>
+<span id="L323" class="LineNr">323 </span><span class="Delimiter">:(code)</span>
+<span id="L324" class="LineNr">324 </span><span class="Normal">int32_t</span> <a href='011run.cc.html#L324'>parse_int</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L325" class="LineNr">325 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L326" class="LineNr">326 </span>  istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L327" class="LineNr">327 </span>  in &gt;&gt; std::hex<span class="Delimiter">;</span>
+<span id="L328" class="LineNr">328 </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 class="Delimiter">{</span>
+<span id="L329" class="LineNr">329 </span>    <span class="Normal">int32_t</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L330" class="LineNr">330 </span>    in &gt;&gt; result<span class="Delimiter">;</span>
+<span id="L331" class="LineNr">331 </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="L332" class="LineNr">332 </span>      <a href='003trace.cc.html#L203'>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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L333" class="LineNr">333 </span>      <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L334" class="LineNr">334 </span>    <span class="Delimiter">}</span>
+<span id="L335" class="LineNr">335 </span>    <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L336" class="LineNr">336 </span>  <span class="Delimiter">}</span>
+<span id="L337" class="LineNr">337 </span>  <span class="Normal">uint32_t</span> uresult = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L338" class="LineNr">338 </span>  in &gt;&gt; uresult<span class="Delimiter">;</span>
+<span id="L339" class="LineNr">339 </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="L340" class="LineNr">340 </span>    <a href='003trace.cc.html#L203'>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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L341" class="LineNr">341 </span>    <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L342" class="LineNr">342 </span>  <span class="Delimiter">}</span>
+<span id="L343" class="LineNr">343 </span>  <span class="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>
+<span id="L344" class="LineNr">344 </span><span class="Delimiter">}</span>
+<span id="L345" class="LineNr">345 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
+<span id="L346" class="LineNr">346 </span><span class="Normal">void</span> <a href='011run.cc.html#L346'>test_parse_int</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L347" class="LineNr">347 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='011run.cc.html#L324'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0&quot;</span><span class="Delimiter">));</span>
+<span id="L348" class="LineNr">348 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='011run.cc.html#L324'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0x0&quot;</span><span class="Delimiter">));</span>
+<span id="L349" class="LineNr">349 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='011run.cc.html#L324'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0x0&quot;</span><span class="Delimiter">));</span>
+<span id="L350" class="LineNr">350 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">16</span><span class="Delimiter">,</span> <a href='011run.cc.html#L324'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;10&quot;</span><span class="Delimiter">));</span>  <span class="Comment">// hex always</span>
+<span id="L351" class="LineNr">351 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>-<span class="Constant">1</span><span class="Delimiter">,</span> <a href='011run.cc.html#L324'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;-1&quot;</span><span class="Delimiter">));</span>
+<span id="L352" class="LineNr">352 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>-<span class="Constant">1</span><span class="Delimiter">,</span> <a href='011run.cc.html#L324'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0xffffffff&quot;</span><span class="Delimiter">));</span>
+<span id="L353" class="LineNr">353 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/013direct_addressing.cc.html b/html/subx/013direct_addressing.cc.html
index 0c945efa..d4e8482c 100644
--- a/html/subx/013direct_addressing.cc.html
+++ b/html/subx/013direct_addressing.cc.html
@@ -83,7 +83,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#L214'>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#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add &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; <a href='003trace.cc.html#L222'>end</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>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[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>
@@ -97,551 +97,563 @@ if ('onhashchange' in window) {
 <span id="L32" class="LineNr"> 32 </span>  <span class="Normal">uint8_t</span> mod = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">6</span><span class="Delimiter">);</span>
 <span id="L33" class="LineNr"> 33 </span>  <span class="Comment">// ignore middle 3 'reg opcode' bits</span>
 <span id="L34" class="LineNr"> 34 </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">uint32_t</span> addr = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L36" class="LineNr"> 36 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L37" class="LineNr"> 37 </span>  <span class="Normal">case</span> <span class="Constant">3</span>:
-<span id="L38" class="LineNr"> 38 </span>    <span class="Comment">// mod 3 is just register direct addressing</span>
-<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;r/m32 is &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L40" class="LineNr"> 40 </span>    <span class="Identifier">return</span> &amp;Reg[rm]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L41" class="LineNr"> 41 </span>  <span class="Comment">// End Mod Special-cases(addr)</span>
-<span id="L42" class="LineNr"> 42 </span>  <span class="Normal">default</span>:
-<span id="L43" class="LineNr"> 43 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized mod bits: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span>mod<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L44" class="LineNr"> 44 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</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="Comment">//: other mods are indirect, and they'll set addr appropriately</span>
-<span id="L47" class="LineNr"> 47 </span>  <span class="Identifier">return</span> <a href='010---vm.cc.html#L129'>mem_addr_i32</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span>
-<span id="L48" class="LineNr"> 48 </span><span class="Delimiter">}</span>
-<span id="L49" class="LineNr"> 49 </span>
-<span id="L50" class="LineNr"> 50 </span>string <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L51" class="LineNr"> 51 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EAX&quot;</span><span class="Delimiter">;</span>
-<span id="L53" class="LineNr"> 53 </span>  <span class="Normal">case</span> <span class="Constant">1</span>: <span class="Identifier">return</span> <span class="Constant">&quot;ECX&quot;</span><span class="Delimiter">;</span>
-<span id="L54" class="LineNr"> 54 </span>  <span class="Normal">case</span> <span class="Constant">2</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EDX&quot;</span><span class="Delimiter">;</span>
-<span id="L55" class="LineNr"> 55 </span>  <span class="Normal">case</span> <span class="Constant">3</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EBX&quot;</span><span class="Delimiter">;</span>
-<span id="L56" class="LineNr"> 56 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Identifier">return</span> <span class="Constant">&quot;ESP&quot;</span><span class="Delimiter">;</span>
-<span id="L57" class="LineNr"> 57 </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="L58" class="LineNr"> 58 </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="L59" class="LineNr"> 59 </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="L60" class="LineNr"> 60 </span>  <span class="Normal">default</span>: <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid register &quot;</span> &lt;&lt; r &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>  <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L61" class="LineNr"> 61 </span>  <span class="Delimiter">}</span>
-<span id="L62" class="LineNr"> 62 </span><span class="Delimiter">}</span>
-<span id="L63" class="LineNr"> 63 </span>
-<span id="L64" class="LineNr"> 64 </span><span class="SalientComment">//:: subtract</span>
-<span id="L65" class="LineNr"> 65 </span>
-<span id="L66" class="LineNr"> 66 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L67" class="LineNr"> 67 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;29&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract r32 from rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L68" class="LineNr"> 68 </span>
-<span id="L69" class="LineNr"> 69 </span><span class="Delimiter">:(scenario subtract_r32_from_r32)</span>
-<span id="L70" class="LineNr"> 70 </span><span class="Special">% Reg[EAX].i = 10;</span>
-<span id="L71" class="LineNr"> 71 </span><span class="Special">% Reg[EBX].i = 1;</span>
-<span id="L72" class="LineNr"> 72 </span>== <span class="Constant">0x1</span>
-<span id="L73" class="LineNr"> 73 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L74" class="LineNr"> 74 </span>  <span class="Constant">29</span>  d8                                      <span class="Comment"># subtract EBX from EAX</span>
-<span id="L75" class="LineNr"> 75 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L76" class="LineNr"> 76 </span><span class="traceContains">+run: subtract <a href='010---vm.cc.html#L16'>EBX</a> from r/m32</span>
-<span id="L77" class="LineNr"> 77 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L78" class="LineNr"> 78 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L79" class="LineNr"> 79 </span>
-<span id="L80" class="LineNr"> 80 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L81" class="LineNr"> 81 </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="L82" class="LineNr"> 82 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L83" class="LineNr"> 83 </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="L84" class="LineNr"> 84 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; from r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L85" class="LineNr"> 85 </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="L86" class="LineNr"> 86 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>
-<span id="L87" class="LineNr"> 87 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L88" class="LineNr"> 88 </span><span class="Delimiter">}</span>
-<span id="L89" class="LineNr"> 89 </span>
-<span id="L90" class="LineNr"> 90 </span><span class="SalientComment">//:: multiply</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#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L38" class="LineNr"> 38 </span>    <span class="Identifier">return</span> &amp;Reg[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#L129'>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>
+<span id="L41" class="LineNr"> 41 </span><span class="Delimiter">}</span>
+<span id="L42" class="LineNr"> 42 </span>
+<span id="L43" class="LineNr"> 43 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L43'>effective_address_number</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="Normal">uint8_t</span> mod = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">6</span><span class="Delimiter">);</span>
+<span id="L45" class="LineNr"> 45 </span>  <span class="Comment">// ignore middle 3 'reg opcode' bits</span>
+<span id="L46" class="LineNr"> 46 </span>  <span class="Normal">uint8_t</span> rm = modrm &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L47" class="LineNr"> 47 </span>  <span class="Normal">uint32_t</span> addr = <span class="Constant">0</span><span class="Delimiter">;</span>
+<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#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;unexpected direct addressing mode</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="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>:
+<span id="L55" class="LineNr"> 55 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized mod bits: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span>mod<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L56" class="LineNr"> 56 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="Delimiter">}</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="Comment">//: other mods are indirect, and they'll set addr appropriately</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Identifier">return</span> addr<span class="Delimiter">;</span>
+<span id="L60" class="LineNr"> 60 </span><span class="Delimiter">}</span>
+<span id="L61" class="LineNr"> 61 </span>
+<span id="L62" class="LineNr"> 62 </span>string <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L63" class="LineNr"> 63 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EAX&quot;</span><span class="Delimiter">;</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="Normal">case</span> <span class="Constant">1</span>: <span class="Identifier">return</span> <span class="Constant">&quot;ECX&quot;</span><span class="Delimiter">;</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="Normal">case</span> <span class="Constant">2</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EDX&quot;</span><span class="Delimiter">;</span>
+<span id="L67" class="LineNr"> 67 </span>  <span class="Normal">case</span> <span class="Constant">3</span>: <span class="Identifier">return</span> <span class="Constant">&quot;EBX&quot;</span><span class="Delimiter">;</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Identifier">return</span> <span class="Constant">&quot;ESP&quot;</span><span class="Delimiter">;</span>
+<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#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid register &quot;</span> &lt;&lt; r &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><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(name)&quot;)</span>
+<span id="L79" class="LineNr"> 79 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;29&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract r32 from rm32&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>
+<span id="L83" class="LineNr"> 83 </span><span class="Special">% Reg[EBX].i = 1;</span>
+<span id="L84" class="LineNr"> 84 </span>== <span class="Constant">0x1</span>
+<span id="L85" class="LineNr"> 85 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L86" class="LineNr"> 86 </span>  <span class="Constant">29</span>  d8                                      <span class="Comment"># subtract EBX from EAX</span>
+<span id="L87" class="LineNr"> 87 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L88" class="LineNr"> 88 </span><span class="traceContains">+run: subtract <a href='010---vm.cc.html#L16'>EBX</a> from r/m32</span>
+<span id="L89" class="LineNr"> 89 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L90" class="LineNr"> 90 </span><span class="traceContains">+run: storing 0x00000009</span>
 <span id="L91" class="LineNr"> 91 </span>
-<span id="L92" class="LineNr"> 92 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L93" class="LineNr"> 93 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;test/negate/mul/div rm32 (with <a href='010---vm.cc.html#L13'>EAX</a> if necessary) depending on subop&quot;</span><span class="Delimiter">);</span>
-<span id="L94" class="LineNr"> 94 </span>
-<span id="L95" class="LineNr"> 95 </span><span class="Delimiter">:(scenario multiply_eax_by_r32)</span>
-<span id="L96" class="LineNr"> 96 </span><span class="Special">% Reg[EAX].i = 4;</span>
-<span id="L97" class="LineNr"> 97 </span><span class="Special">% Reg[ECX].i = 3;</span>
-<span id="L98" class="LineNr"> 98 </span>== <span class="Constant">0x1</span>
-<span id="L99" class="LineNr"> 99 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L100" class="LineNr">100 </span>  f7      e1                                      <span class="Comment"># multiply EAX by ECX</span>
-<span id="L101" class="LineNr">101 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (subop mul) 001 (src ECX)</span>
-<span id="L102" class="LineNr">102 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L103" class="LineNr">103 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L14'>ECX</a></span>
-<span id="L104" class="LineNr">104 </span><span class="traceContains">+run: subop: multiply <a href='010---vm.cc.html#L13'>EAX</a> by r/m32</span>
-<span id="L105" class="LineNr">105 </span><span class="traceContains">+run: storing 0x0000000c</span>
+<span id="L92" class="LineNr"> 92 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<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">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L95" class="LineNr"> 95 </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#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract &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; <a href='003trace.cc.html#L222'>end</a><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#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[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>
+<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="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(name)&quot;)</span>
+<span id="L105" class="LineNr">105 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;test/negate/mul/div rm32 (with <a href='010---vm.cc.html#L13'>EAX</a> if necessary) depending on subop&quot;</span><span class="Delimiter">);</span>
 <span id="L106" class="LineNr">106 </span>
-<span id="L107" class="LineNr">107 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L108" class="LineNr">108 </span><span class="Normal">case</span> <span class="Constant">0xf7</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
-<span id="L109" class="LineNr">109 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L110" class="LineNr">110 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;operate on r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L111" class="LineNr">111 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L112" class="LineNr">112 </span>  <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
-<span id="L113" class="LineNr">113 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// mul unsigned EAX by r/m32</span>
-<span id="L115" class="LineNr">115 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: multiply <a href='010---vm.cc.html#L13'>EAX</a> by r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L116" class="LineNr">116 </span>    <span class="Normal">uint64_t</span> result = Reg[EAX]<span class="Delimiter">.</span>u * <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
-<span id="L117" class="LineNr">117 </span>    Reg[EAX]<span class="Delimiter">.</span>u = result &amp; <span class="Constant">0xffffffff</span><span class="Delimiter">;</span>
-<span id="L118" class="LineNr">118 </span>    Reg[EDX]<span class="Delimiter">.</span>u = result &gt;&gt; <span class="Constant">32</span><span class="Delimiter">;</span>
-<span id="L119" class="LineNr">119 </span>    <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>Reg[EDX]<span class="Delimiter">.</span>u != <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L120" class="LineNr">120 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L121" class="LineNr">121 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Delimiter">}</span>
-<span id="L123" class="LineNr">123 </span>  <span class="Comment">// End Op f7 Subops</span>
-<span id="L124" class="LineNr">124 </span>  <span class="Normal">default</span>:
-<span id="L125" class="LineNr">125 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after f7: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L126" class="LineNr">126 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L127" class="LineNr">127 </span>  <span class="Delimiter">}</span>
-<span id="L128" class="LineNr">128 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L129" class="LineNr">129 </span><span class="Delimiter">}</span>
-<span id="L130" class="LineNr">130 </span>
-<span id="L131" class="LineNr">131 </span><span class="Comment">//:</span>
-<span id="L132" class="LineNr">132 </span>
-<span id="L133" class="LineNr">133 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L134" class="LineNr">134 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;multiply rm32 into r32&quot;</span><span class="Delimiter">);</span>
-<span id="L135" class="LineNr">135 </span>
-<span id="L136" class="LineNr">136 </span><span class="Delimiter">:(scenario multiply_r32_into_r32)</span>
-<span id="L137" class="LineNr">137 </span><span class="Special">% Reg[EAX].i = 4;</span>
-<span id="L138" class="LineNr">138 </span><span class="Special">% Reg[EBX].i = 2;</span>
-<span id="L139" class="LineNr">139 </span>== <span class="Constant">0x1</span>
-<span id="L140" class="LineNr">140 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Constant">0f</span> af   d8                                      <span class="Comment"># subtract EBX into EAX</span>
-<span id="L142" class="LineNr">142 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L143" class="LineNr">143 </span><span class="traceContains">+run: multiply r/m32 into <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L144" class="LineNr">144 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L145" class="LineNr">145 </span><span class="traceContains">+run: storing 0x00000008</span>
-<span id="L146" class="LineNr">146 </span>
-<span id="L147" class="LineNr">147 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
-<span id="L148" class="LineNr">148 </span><span class="Normal">case</span> <span class="Constant">0xaf</span>: <span class="Delimiter">{</span>  <span class="Comment">// multiply r32 into r/m32</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L150" class="LineNr">150 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L151" class="LineNr">151 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;multiply r/m32 into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L152" class="LineNr">152 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L153" class="LineNr">153 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>*<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg1<span class="Delimiter">);</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L155" class="LineNr">155 </span><span class="Delimiter">}</span>
-<span id="L156" class="LineNr">156 </span>
-<span id="L157" class="LineNr">157 </span><span class="SalientComment">//:: and</span>
+<span id="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>
+<span id="L109" class="LineNr">109 </span><span class="Special">% Reg[ECX].i = 3;</span>
+<span id="L110" class="LineNr">110 </span>== <span class="Constant">0x1</span>
+<span id="L111" class="LineNr">111 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
+<span id="L112" class="LineNr">112 </span>  f7      e1                                      <span class="Comment"># multiply EAX by ECX</span>
+<span id="L113" class="LineNr">113 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (subop mul) 001 (src ECX)</span>
+<span id="L114" class="LineNr">114 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L115" class="LineNr">115 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L14'>ECX</a></span>
+<span id="L116" class="LineNr">116 </span><span class="traceContains">+run: subop: multiply <a href='010---vm.cc.html#L13'>EAX</a> by r/m32</span>
+<span id="L117" class="LineNr">117 </span><span class="traceContains">+run: storing 0x0000000c</span>
+<span id="L118" class="LineNr">118 </span>
+<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 class="Comment">// xor r32 with r/m32</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L122" class="LineNr">122 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;operate on r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="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">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#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: multiply <a href='010---vm.cc.html#L13'>EAX</a> by r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L128" class="LineNr">128 </span>    <span class="Normal">uint64_t</span> result = Reg[EAX]<span class="Delimiter">.</span>u * <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
+<span id="L129" class="LineNr">129 </span>    Reg[EAX]<span class="Delimiter">.</span>u = result &amp; <span class="Constant">0xffffffff</span><span class="Delimiter">;</span>
+<span id="L130" class="LineNr">130 </span>    Reg[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#L59'>OF</a> = <span class="Delimiter">(</span>Reg[EDX]<span class="Delimiter">.</span>u != <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L132" class="LineNr">132 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="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>
+<span id="L136" class="LineNr">136 </span>  <span class="Normal">default</span>:
+<span id="L137" class="LineNr">137 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after f7: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L138" class="LineNr">138 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Delimiter">}</span>
+<span id="L140" class="LineNr">140 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L141" class="LineNr">141 </span><span class="Delimiter">}</span>
+<span id="L142" class="LineNr">142 </span>
+<span id="L143" class="LineNr">143 </span><span class="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(name)&quot;)</span>
+<span id="L146" class="LineNr">146 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;multiply rm32 into r32&quot;</span><span class="Delimiter">);</span>
+<span id="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>
+<span id="L150" class="LineNr">150 </span><span class="Special">% Reg[EBX].i = 2;</span>
+<span id="L151" class="LineNr">151 </span>== <span class="Constant">0x1</span>
+<span id="L152" class="LineNr">152 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
+<span id="L153" class="LineNr">153 </span>  <span class="Constant">0f</span> af   d8                                      <span class="Comment"># subtract EBX into EAX</span>
+<span id="L154" class="LineNr">154 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L155" class="LineNr">155 </span><span class="traceContains">+run: multiply r/m32 into <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L156" class="LineNr">156 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L157" class="LineNr">157 </span><span class="traceContains">+run: storing 0x00000008</span>
 <span id="L158" class="LineNr">158 </span>
-<span id="L159" class="LineNr">159 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L160" class="LineNr">160 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise AND of r32 with rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L161" class="LineNr">161 </span>
-<span id="L162" class="LineNr">162 </span><span class="Delimiter">:(scenario and_r32_with_r32)</span>
-<span id="L163" class="LineNr">163 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L164" class="LineNr">164 </span><span class="Special">% Reg[EBX].i = 0x000000ff;</span>
-<span id="L165" class="LineNr">165 </span>== <span class="Constant">0x1</span>
-<span id="L166" class="LineNr">166 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L167" class="LineNr">167 </span>  <span class="Constant">21</span>  d8                                      <span class="Comment"># and EBX with destination EAX</span>
-<span id="L168" class="LineNr">168 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L169" class="LineNr">169 </span><span class="traceContains">+run: and <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L170" class="LineNr">170 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L171" class="LineNr">171 </span><span class="traceContains">+run: storing 0x0000000d</span>
-<span id="L172" class="LineNr">172 </span>
-<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L174" class="LineNr">174 </span><span class="Normal">case</span> <span class="Constant">0x21</span>: <span class="Delimiter">{</span>  <span class="Comment">// and r32 with r/m32</span>
-<span id="L175" class="LineNr">175 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L176" class="LineNr">176 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L177" class="LineNr">177 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L178" class="LineNr">178 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L179" class="LineNr">179 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L180" class="LineNr">180 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L181" class="LineNr">181 </span><span class="Delimiter">}</span>
-<span id="L182" class="LineNr">182 </span>
-<span id="L183" class="LineNr">183 </span><span class="SalientComment">//:: or</span>
+<span id="L159" class="LineNr">159 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
+<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">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L162" class="LineNr">162 </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#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;multiply r/m32 into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L164" class="LineNr">164 </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#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>*<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg1<span class="Delimiter">);</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L167" class="LineNr">167 </span><span class="Delimiter">}</span>
+<span id="L168" class="LineNr">168 </span>
+<span id="L169" class="LineNr">169 </span><span class="SalientComment">//:: and</span>
+<span id="L170" class="LineNr">170 </span>
+<span id="L171" class="LineNr">171 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L172" class="LineNr">172 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise AND of r32 with rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L173" class="LineNr">173 </span>
+<span id="L174" class="LineNr">174 </span><span class="Delimiter">:(scenario and_r32_with_r32)</span>
+<span id="L175" class="LineNr">175 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L176" class="LineNr">176 </span><span class="Special">% Reg[EBX].i = 0x000000ff;</span>
+<span id="L177" class="LineNr">177 </span>== <span class="Constant">0x1</span>
+<span id="L178" class="LineNr">178 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L179" class="LineNr">179 </span>  <span class="Constant">21</span>  d8                                      <span class="Comment"># and EBX with destination EAX</span>
+<span id="L180" class="LineNr">180 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L181" class="LineNr">181 </span><span class="traceContains">+run: and <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L182" class="LineNr">182 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L183" class="LineNr">183 </span><span class="traceContains">+run: storing 0x0000000d</span>
 <span id="L184" class="LineNr">184 </span>
-<span id="L185" class="LineNr">185 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L186" class="LineNr">186 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise OR of r32 with rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L187" class="LineNr">187 </span>
-<span id="L188" class="LineNr">188 </span><span class="Delimiter">:(scenario or_r32_with_r32)</span>
-<span id="L189" class="LineNr">189 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L190" class="LineNr">190 </span><span class="Special">% Reg[EBX].i = 0xa0b0c0d0;</span>
-<span id="L191" class="LineNr">191 </span>== <span class="Constant">0x1</span>
-<span id="L192" class="LineNr">192 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L193" class="LineNr">193 </span>  <span class="Error">09</span>  d8                                      <span class="Comment"># or EBX with destination EAX</span>
-<span id="L194" class="LineNr">194 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L195" class="LineNr">195 </span><span class="traceContains">+run: or <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L196" class="LineNr">196 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L197" class="LineNr">197 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
-<span id="L198" class="LineNr">198 </span>
-<span id="L199" class="LineNr">199 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L200" class="LineNr">200 </span><span class="Normal">case</span> <span class="Constant">0x09</span>: <span class="Delimiter">{</span>  <span class="Comment">// or r32 with r/m32</span>
-<span id="L201" class="LineNr">201 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L202" class="LineNr">202 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L203" class="LineNr">203 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L204" class="LineNr">204 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L205" class="LineNr">205 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L206" class="LineNr">206 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L207" class="LineNr">207 </span><span class="Delimiter">}</span>
-<span id="L208" class="LineNr">208 </span>
-<span id="L209" class="LineNr">209 </span><span class="SalientComment">//:: xor</span>
+<span id="L185" class="LineNr">185 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L186" class="LineNr">186 </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="L187" class="LineNr">187 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L188" class="LineNr">188 </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="L189" class="LineNr">189 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L190" class="LineNr">190 </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="L191" class="LineNr">191 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L192" class="LineNr">192 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L193" class="LineNr">193 </span><span class="Delimiter">}</span>
+<span id="L194" class="LineNr">194 </span>
+<span id="L195" class="LineNr">195 </span><span class="SalientComment">//:: or</span>
+<span id="L196" class="LineNr">196 </span>
+<span id="L197" class="LineNr">197 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L198" class="LineNr">198 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise OR of r32 with rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L199" class="LineNr">199 </span>
+<span id="L200" class="LineNr">200 </span><span class="Delimiter">:(scenario or_r32_with_r32)</span>
+<span id="L201" class="LineNr">201 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L202" class="LineNr">202 </span><span class="Special">% Reg[EBX].i = 0xa0b0c0d0;</span>
+<span id="L203" class="LineNr">203 </span>== <span class="Constant">0x1</span>
+<span id="L204" class="LineNr">204 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Error">09</span>  d8                                      <span class="Comment"># or EBX with destination EAX</span>
+<span id="L206" class="LineNr">206 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L207" class="LineNr">207 </span><span class="traceContains">+run: or <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L208" class="LineNr">208 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L209" class="LineNr">209 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
 <span id="L210" class="LineNr">210 </span>
-<span id="L211" class="LineNr">211 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L212" class="LineNr">212 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise XOR of r32 with rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L213" class="LineNr">213 </span>
-<span id="L214" class="LineNr">214 </span><span class="Delimiter">:(scenario xor_r32_with_r32)</span>
-<span id="L215" class="LineNr">215 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L216" class="LineNr">216 </span><span class="Special">% Reg[EBX].i = 0xaabbc0d0;</span>
-<span id="L217" class="LineNr">217 </span>== <span class="Constant">0x1</span>
-<span id="L218" class="LineNr">218 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L219" class="LineNr">219 </span>  <span class="Constant">31</span>  d8                                      <span class="Comment"># xor EBX with destination EAX</span>
-<span id="L220" class="LineNr">220 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L221" class="LineNr">221 </span><span class="traceContains">+run: xor <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L222" class="LineNr">222 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L223" class="LineNr">223 </span><span class="traceContains">+run: storing 0xa0b0ccdd</span>
-<span id="L224" class="LineNr">224 </span>
-<span id="L225" class="LineNr">225 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L226" class="LineNr">226 </span><span class="Normal">case</span> <span class="Constant">0x31</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
-<span id="L227" class="LineNr">227 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L228" class="LineNr">228 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L229" class="LineNr">229 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L230" class="LineNr">230 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L231" class="LineNr">231 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L232" class="LineNr">232 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L233" class="LineNr">233 </span><span class="Delimiter">}</span>
-<span id="L234" class="LineNr">234 </span>
-<span id="L235" class="LineNr">235 </span><span class="SalientComment">//:: not</span>
+<span id="L211" class="LineNr">211 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L212" class="LineNr">212 </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="L213" class="LineNr">213 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L214" class="LineNr">214 </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="L215" class="LineNr">215 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L216" class="LineNr">216 </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="L217" class="LineNr">217 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L218" class="LineNr">218 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L219" class="LineNr">219 </span><span class="Delimiter">}</span>
+<span id="L220" class="LineNr">220 </span>
+<span id="L221" class="LineNr">221 </span><span class="SalientComment">//:: xor</span>
+<span id="L222" class="LineNr">222 </span>
+<span id="L223" class="LineNr">223 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L224" class="LineNr">224 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise XOR of r32 with rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L225" class="LineNr">225 </span>
+<span id="L226" class="LineNr">226 </span><span class="Delimiter">:(scenario xor_r32_with_r32)</span>
+<span id="L227" class="LineNr">227 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L228" class="LineNr">228 </span><span class="Special">% Reg[EBX].i = 0xaabbc0d0;</span>
+<span id="L229" class="LineNr">229 </span>== <span class="Constant">0x1</span>
+<span id="L230" class="LineNr">230 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L231" class="LineNr">231 </span>  <span class="Constant">31</span>  d8                                      <span class="Comment"># xor EBX with destination EAX</span>
+<span id="L232" class="LineNr">232 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L233" class="LineNr">233 </span><span class="traceContains">+run: xor <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L234" class="LineNr">234 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L235" class="LineNr">235 </span><span class="traceContains">+run: storing 0xa0b0ccdd</span>
 <span id="L236" class="LineNr">236 </span>
-<span id="L237" class="LineNr">237 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L238" class="LineNr">238 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;bitwise complement of rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L239" class="LineNr">239 </span>
-<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(scenario not_r32)</span>
-<span id="L241" class="LineNr">241 </span><span class="Special">% Reg[EBX].i = 0x0f0f00ff;</span>
-<span id="L242" class="LineNr">242 </span>== <span class="Constant">0x1</span>
-<span id="L243" class="LineNr">243 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L244" class="LineNr">244 </span>  f7  d3                                      <span class="Comment"># not EBX</span>
-<span id="L245" class="LineNr">245 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 010 (subop not) 011 (dest EBX)</span>
-<span id="L246" class="LineNr">246 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L247" class="LineNr">247 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L248" class="LineNr">248 </span><span class="traceContains">+run: subop: not</span>
-<span id="L249" class="LineNr">249 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
-<span id="L250" class="LineNr">250 </span>
-<span id="L251" class="LineNr">251 </span><span class="Delimiter">:(before &quot;End Op f7 Subops&quot;)</span>
-<span id="L252" class="LineNr">252 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span>  <span class="Comment">// not r/m32</span>
-<span id="L253" class="LineNr">253 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: not&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L254" class="LineNr">254 </span>  *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
-<span id="L255" class="LineNr">255 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L256" class="LineNr">256 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
-<span id="L257" class="LineNr">257 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L258" class="LineNr">258 </span>  <a href='010---vm.cc.html#L59'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L259" class="LineNr">259 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L260" class="LineNr">260 </span><span class="Delimiter">}</span>
-<span id="L261" class="LineNr">261 </span>
-<span id="L262" class="LineNr">262 </span><span class="SalientComment">//:: compare (cmp)</span>
-<span id="L263" class="LineNr">263 </span>
-<span id="L264" class="LineNr">264 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L265" class="LineNr">265 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if rm32 &lt; r32&quot;</span><span class="Delimiter">);</span>
-<span id="L266" class="LineNr">266 </span>
-<span id="L267" class="LineNr">267 </span><span class="Delimiter">:(scenario compare_r32_with_r32_greater)</span>
-<span id="L268" class="LineNr">268 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L269" class="LineNr">269 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</span>
-<span id="L270" class="LineNr">270 </span>== <span class="Constant">0x1</span>
-<span id="L271" class="LineNr">271 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L272" class="LineNr">272 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L273" class="LineNr">273 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L274" class="LineNr">274 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L275" class="LineNr">275 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L276" class="LineNr">276 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L277" class="LineNr">277 </span>
-<span id="L278" class="LineNr">278 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L279" class="LineNr">279 </span><span class="Normal">case</span> <span class="Constant">0x39</span>: <span class="Delimiter">{</span>  <span class="Comment">// set SF if r/m32 &lt; r32</span>
-<span id="L280" class="LineNr">280 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L281" class="LineNr">281 </span>  <span class="Normal">uint8_t</span> reg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L282" class="LineNr">282 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L283" class="LineNr">283 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L284" class="LineNr">284 </span>  <span class="Normal">int32_t</span> arg2 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L285" class="LineNr">285 </span>  <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L286" class="LineNr">286 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L287" class="LineNr">287 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L288" class="LineNr">288 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L289" class="LineNr">289 </span>  <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L290" class="LineNr">290 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L291" class="LineNr">291 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L292" class="LineNr">292 </span><span class="Delimiter">}</span>
-<span id="L293" class="LineNr">293 </span>
-<span id="L294" class="LineNr">294 </span><span class="Delimiter">:(scenario compare_r32_with_r32_lesser)</span>
-<span id="L295" class="LineNr">295 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c07;</span>
-<span id="L296" class="LineNr">296 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L297" class="LineNr">297 </span>== <span class="Constant">0x1</span>
-<span id="L298" class="LineNr">298 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L300" class="LineNr">300 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L301" class="LineNr">301 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L302" class="LineNr">302 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L303" class="LineNr">303 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L304" class="LineNr">304 </span>
-<span id="L305" class="LineNr">305 </span><span class="Delimiter">:(scenario compare_r32_with_r32_equal)</span>
-<span id="L306" class="LineNr">306 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L307" class="LineNr">307 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L308" class="LineNr">308 </span>== <span class="Constant">0x1</span>
-<span id="L309" class="LineNr">309 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L310" class="LineNr">310 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L311" class="LineNr">311 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L312" class="LineNr">312 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L313" class="LineNr">313 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L314" class="LineNr">314 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L315" class="LineNr">315 </span>
-<span id="L316" class="LineNr">316 </span><span class="SalientComment">//:: copy (mov)</span>
-<span id="L317" class="LineNr">317 </span>
-<span id="L318" class="LineNr">318 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L319" class="LineNr">319 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r32 to rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L320" class="LineNr">320 </span>
-<span id="L321" class="LineNr">321 </span><span class="Delimiter">:(scenario copy_r32_to_r32)</span>
-<span id="L322" class="LineNr">322 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
-<span id="L323" class="LineNr">323 </span>== <span class="Constant">0x1</span>
-<span id="L324" class="LineNr">324 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L325" class="LineNr">325 </span>  <span class="Constant">89</span>  d8                                      <span class="Comment"># copy EBX to EAX</span>
-<span id="L326" class="LineNr">326 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L327" class="LineNr">327 </span><span class="traceContains">+run: copy <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L328" class="LineNr">328 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L329" class="LineNr">329 </span><span class="traceContains">+run: storing 0x000000af</span>
-<span id="L330" class="LineNr">330 </span>
-<span id="L331" class="LineNr">331 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L332" class="LineNr">332 </span><span class="Normal">case</span> <span class="Constant">0x89</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r32 to r/m32</span>
-<span id="L333" class="LineNr">333 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L334" class="LineNr">334 </span>  <span class="Normal">uint8_t</span> reg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L335" class="LineNr">335 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L336" class="LineNr">336 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L337" class="LineNr">337 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L338" class="LineNr">338 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L339" class="LineNr">339 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L340" class="LineNr">340 </span><span class="Delimiter">}</span>
-<span id="L341" class="LineNr">341 </span>
-<span id="L342" class="LineNr">342 </span><span class="SalientComment">//:: xchg</span>
-<span id="L343" class="LineNr">343 </span>
-<span id="L344" class="LineNr">344 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L345" class="LineNr">345 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;swap the <a href='003trace.cc.html#L74'>contents</a> of r32 and rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L346" class="LineNr">346 </span>
-<span id="L347" class="LineNr">347 </span><span class="Delimiter">:(scenario xchg_r32_with_r32)</span>
-<span id="L348" class="LineNr">348 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
-<span id="L349" class="LineNr">349 </span><span class="Special">% Reg[EAX].i = 0x2e;</span>
-<span id="L350" class="LineNr">350 </span>== <span class="Constant">0x1</span>
-<span id="L351" class="LineNr">351 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L352" class="LineNr">352 </span>  <span class="Constant">87</span>  d8                                      <span class="Comment"># exchange EBX with EAX</span>
-<span id="L353" class="LineNr">353 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L354" class="LineNr">354 </span><span class="traceContains">+run: exchange <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L355" class="LineNr">355 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L356" class="LineNr">356 </span><span class="traceContains">+run: storing 0x000000af in r/m32</span>
-<span id="L357" class="LineNr">357 </span><span class="traceContains">+run: storing 0x0000002e in <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L237" class="LineNr">237 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L238" class="LineNr">238 </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="L239" class="LineNr">239 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L240" class="LineNr">240 </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="L241" class="LineNr">241 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L242" class="LineNr">242 </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="L243" class="LineNr">243 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L244" class="LineNr">244 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L245" class="LineNr">245 </span><span class="Delimiter">}</span>
+<span id="L246" class="LineNr">246 </span>
+<span id="L247" class="LineNr">247 </span><span class="SalientComment">//:: not</span>
+<span id="L248" class="LineNr">248 </span>
+<span id="L249" class="LineNr">249 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L250" class="LineNr">250 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;bitwise complement of rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L251" class="LineNr">251 </span>
+<span id="L252" class="LineNr">252 </span><span class="Delimiter">:(scenario not_r32)</span>
+<span id="L253" class="LineNr">253 </span><span class="Special">% Reg[EBX].i = 0x0f0f00ff;</span>
+<span id="L254" class="LineNr">254 </span>== <span class="Constant">0x1</span>
+<span id="L255" class="LineNr">255 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L256" class="LineNr">256 </span>  f7  d3                                      <span class="Comment"># not EBX</span>
+<span id="L257" class="LineNr">257 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 010 (subop not) 011 (dest EBX)</span>
+<span id="L258" class="LineNr">258 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L259" class="LineNr">259 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L260" class="LineNr">260 </span><span class="traceContains">+run: subop: not</span>
+<span id="L261" class="LineNr">261 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
+<span id="L262" class="LineNr">262 </span>
+<span id="L263" class="LineNr">263 </span><span class="Delimiter">:(before &quot;End Op f7 Subops&quot;)</span>
+<span id="L264" class="LineNr">264 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span>  <span class="Comment">// not r/m32</span>
+<span id="L265" class="LineNr">265 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: not&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L266" class="LineNr">266 </span>  *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
+<span id="L267" class="LineNr">267 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L268" class="LineNr">268 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
+<span id="L269" class="LineNr">269 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L270" class="LineNr">270 </span>  <a href='010---vm.cc.html#L59'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L271" class="LineNr">271 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L272" class="LineNr">272 </span><span class="Delimiter">}</span>
+<span id="L273" class="LineNr">273 </span>
+<span id="L274" class="LineNr">274 </span><span class="SalientComment">//:: compare (cmp)</span>
+<span id="L275" class="LineNr">275 </span>
+<span id="L276" class="LineNr">276 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L277" class="LineNr">277 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if rm32 &lt; r32&quot;</span><span class="Delimiter">);</span>
+<span id="L278" class="LineNr">278 </span>
+<span id="L279" class="LineNr">279 </span><span class="Delimiter">:(scenario compare_r32_with_r32_greater)</span>
+<span id="L280" class="LineNr">280 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L281" class="LineNr">281 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</span>
+<span id="L282" class="LineNr">282 </span>== <span class="Constant">0x1</span>
+<span id="L283" class="LineNr">283 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L284" class="LineNr">284 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
+<span id="L285" class="LineNr">285 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L286" class="LineNr">286 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L287" class="LineNr">287 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L288" class="LineNr">288 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
+<span id="L289" class="LineNr">289 </span>
+<span id="L290" class="LineNr">290 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L291" class="LineNr">291 </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="L292" class="LineNr">292 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L293" class="LineNr">293 </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="L294" class="LineNr">294 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L295" class="LineNr">295 </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="L296" class="LineNr">296 </span>  <span class="Normal">int32_t</span> arg2 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L297" class="LineNr">297 </span>  <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L298" class="LineNr">298 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L299" class="LineNr">299 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L301" class="LineNr">301 </span>  <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L302" class="LineNr">302 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L303" class="LineNr">303 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L304" class="LineNr">304 </span><span class="Delimiter">}</span>
+<span id="L305" class="LineNr">305 </span>
+<span id="L306" class="LineNr">306 </span><span class="Delimiter">:(scenario compare_r32_with_r32_lesser)</span>
+<span id="L307" class="LineNr">307 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c07;</span>
+<span id="L308" class="LineNr">308 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
+<span id="L309" class="LineNr">309 </span>== <span class="Constant">0x1</span>
+<span id="L310" class="LineNr">310 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L311" class="LineNr">311 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
+<span id="L312" class="LineNr">312 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L313" class="LineNr">313 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L314" class="LineNr">314 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L315" class="LineNr">315 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
+<span id="L316" class="LineNr">316 </span>
+<span id="L317" class="LineNr">317 </span><span class="Delimiter">:(scenario compare_r32_with_r32_equal)</span>
+<span id="L318" class="LineNr">318 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L319" class="LineNr">319 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
+<span id="L320" class="LineNr">320 </span>== <span class="Constant">0x1</span>
+<span id="L321" class="LineNr">321 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L322" class="LineNr">322 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
+<span id="L323" class="LineNr">323 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L324" class="LineNr">324 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L325" class="LineNr">325 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L326" class="LineNr">326 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
+<span id="L327" class="LineNr">327 </span>
+<span id="L328" class="LineNr">328 </span><span class="SalientComment">//:: copy (mov)</span>
+<span id="L329" class="LineNr">329 </span>
+<span id="L330" class="LineNr">330 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L331" class="LineNr">331 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r32 to rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L332" class="LineNr">332 </span>
+<span id="L333" class="LineNr">333 </span><span class="Delimiter">:(scenario copy_r32_to_r32)</span>
+<span id="L334" class="LineNr">334 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
+<span id="L335" class="LineNr">335 </span>== <span class="Constant">0x1</span>
+<span id="L336" class="LineNr">336 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L337" class="LineNr">337 </span>  <span class="Constant">89</span>  d8                                      <span class="Comment"># copy EBX to EAX</span>
+<span id="L338" class="LineNr">338 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L339" class="LineNr">339 </span><span class="traceContains">+run: copy <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
+<span id="L340" class="LineNr">340 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L341" class="LineNr">341 </span><span class="traceContains">+run: storing 0x000000af</span>
+<span id="L342" class="LineNr">342 </span>
+<span id="L343" class="LineNr">343 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L344" class="LineNr">344 </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="L345" class="LineNr">345 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L346" class="LineNr">346 </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="L347" class="LineNr">347 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy &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; to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L348" class="LineNr">348 </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="L349" class="LineNr">349 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L350" class="LineNr">350 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L351" class="LineNr">351 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L352" class="LineNr">352 </span><span class="Delimiter">}</span>
+<span id="L353" class="LineNr">353 </span>
+<span id="L354" class="LineNr">354 </span><span class="SalientComment">//:: xchg</span>
+<span id="L355" class="LineNr">355 </span>
+<span id="L356" class="LineNr">356 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L357" class="LineNr">357 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;swap the <a href='003trace.cc.html#L74'>contents</a> of r32 and rm32&quot;</span><span class="Delimiter">);</span>
 <span id="L358" class="LineNr">358 </span>
-<span id="L359" class="LineNr">359 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L360" class="LineNr">360 </span><span class="Normal">case</span> <span class="Constant">0x87</span>: <span class="Delimiter">{</span>  <span class="Comment">// exchange r32 with r/m32</span>
-<span id="L361" class="LineNr">361 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L362" class="LineNr">362 </span>  <span class="Normal">uint8_t</span> reg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L363" class="LineNr">363 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;exchange &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L364" class="LineNr">364 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L365" class="LineNr">365 </span>  <span class="Normal">int32_t</span> tmp = *arg1<span class="Delimiter">;</span>
-<span id="L366" class="LineNr">366 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L367" class="LineNr">367 </span>  Reg[reg2]<span class="Delimiter">.</span>i = tmp<span class="Delimiter">;</span>
-<span id="L368" class="LineNr">368 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <span class="Constant">&quot; in r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L369" class="LineNr">369 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[reg2]<span class="Delimiter">.</span>i &lt;&lt; <span class="Constant">&quot; in &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L370" class="LineNr">370 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L371" class="LineNr">371 </span><span class="Delimiter">}</span>
-<span id="L372" class="LineNr">372 </span>
-<span id="L373" class="LineNr">373 </span><span class="SalientComment">//:: increment</span>
-<span id="L374" class="LineNr">374 </span>
-<span id="L375" class="LineNr">375 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L376" class="LineNr">376 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;40&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L377" class="LineNr">377 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;41&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R1 (ECX)&quot;</span><span class="Delimiter">);</span>
-<span id="L378" class="LineNr">378 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;42&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R2 (EDX)&quot;</span><span class="Delimiter">);</span>
-<span id="L379" class="LineNr">379 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;43&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R3 (EBX)&quot;</span><span class="Delimiter">);</span>
-<span id="L380" class="LineNr">380 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;44&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R4 (ESP)&quot;</span><span class="Delimiter">);</span>
-<span id="L381" class="LineNr">381 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;45&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R5 (EBP)&quot;</span><span class="Delimiter">);</span>
-<span id="L382" class="LineNr">382 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;46&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R6 (ESI)&quot;</span><span class="Delimiter">);</span>
-<span id="L383" class="LineNr">383 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;47&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R7 (EDI)&quot;</span><span class="Delimiter">);</span>
+<span id="L359" class="LineNr">359 </span><span class="Delimiter">:(scenario xchg_r32_with_r32)</span>
+<span id="L360" class="LineNr">360 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
+<span id="L361" class="LineNr">361 </span><span class="Special">% Reg[EAX].i = 0x2e;</span>
+<span id="L362" class="LineNr">362 </span>== <span class="Constant">0x1</span>
+<span id="L363" class="LineNr">363 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L364" class="LineNr">364 </span>  <span class="Constant">87</span>  d8                                      <span class="Comment"># exchange EBX with EAX</span>
+<span id="L365" class="LineNr">365 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L366" class="LineNr">366 </span><span class="traceContains">+run: exchange <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L367" class="LineNr">367 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L368" class="LineNr">368 </span><span class="traceContains">+run: storing 0x000000af in r/m32</span>
+<span id="L369" class="LineNr">369 </span><span class="traceContains">+run: storing 0x0000002e in <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L370" class="LineNr">370 </span>
+<span id="L371" class="LineNr">371 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L372" class="LineNr">372 </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="L373" class="LineNr">373 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L374" class="LineNr">374 </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="L375" class="LineNr">375 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;exchange &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L376" class="LineNr">376 </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="L377" class="LineNr">377 </span>  <span class="Normal">int32_t</span> tmp = *arg1<span class="Delimiter">;</span>
+<span id="L378" class="LineNr">378 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L379" class="LineNr">379 </span>  Reg[reg2]<span class="Delimiter">.</span>i = tmp<span class="Delimiter">;</span>
+<span id="L380" class="LineNr">380 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <span class="Constant">&quot; in r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L381" class="LineNr">381 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L382" class="LineNr">382 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L383" class="LineNr">383 </span><span class="Delimiter">}</span>
 <span id="L384" class="LineNr">384 </span>
-<span id="L385" class="LineNr">385 </span><span class="Delimiter">:(scenario increment_r32)</span>
-<span id="L386" class="LineNr">386 </span><span class="Special">% Reg[ECX].u = 0x1f;</span>
-<span id="L387" class="LineNr">387 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L388" class="LineNr">388 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L389" class="LineNr">389 </span>  <span class="Constant">41</span>                                          <span class="Comment"># increment ECX</span>
-<span id="L390" class="LineNr">390 </span><span class="traceContains">+run: increment <a href='010---vm.cc.html#L14'>ECX</a></span>
-<span id="L391" class="LineNr">391 </span><span class="traceContains">+run: storing value 0x00000020</span>
-<span id="L392" class="LineNr">392 </span>
-<span id="L393" class="LineNr">393 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L394" class="LineNr">394 </span><span class="Normal">case</span> <span class="Constant">0x40</span>:
-<span id="L395" class="LineNr">395 </span><span class="Normal">case</span> <span class="Constant">0x41</span>:
-<span id="L396" class="LineNr">396 </span><span class="Normal">case</span> <span class="Constant">0x42</span>:
-<span id="L397" class="LineNr">397 </span><span class="Normal">case</span> <span class="Constant">0x43</span>:
-<span id="L398" class="LineNr">398 </span><span class="Normal">case</span> <span class="Constant">0x44</span>:
-<span id="L399" class="LineNr">399 </span><span class="Normal">case</span> <span class="Constant">0x45</span>:
-<span id="L400" class="LineNr">400 </span><span class="Normal">case</span> <span class="Constant">0x46</span>:
-<span id="L401" class="LineNr">401 </span><span class="Normal">case</span> <span class="Constant">0x47</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r32</span>
-<span id="L402" class="LineNr">402 </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="L403" class="LineNr">403 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L404" class="LineNr">404 </span>  ++Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L405" class="LineNr">405 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[reg]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L406" class="LineNr">406 </span>  <span class="Identifier">break</span><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="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L410" class="LineNr">410 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;inc/dec/jump/push/call rm32 based on subop&quot;</span><span class="Delimiter">);</span>
-<span id="L411" class="LineNr">411 </span>
-<span id="L412" class="LineNr">412 </span><span class="Delimiter">:(scenario increment_rm32)</span>
-<span id="L413" class="LineNr">413 </span><span class="Special">% Reg[EAX].u = 0x20;</span>
-<span id="L414" class="LineNr">414 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L415" class="LineNr">415 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L416" class="LineNr">416 </span>  ff  c0                                      <span class="Comment"># increment EAX</span>
-<span id="L417" class="LineNr">417 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 000 (subop inc) 000 (EAX)</span>
-<span id="L418" class="LineNr">418 </span><span class="traceContains">+run: increment r/m32</span>
-<span id="L419" class="LineNr">419 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L420" class="LineNr">420 </span><span class="traceContains">+run: storing value 0x00000021</span>
-<span id="L421" class="LineNr">421 </span>
-<span id="L422" class="LineNr">422 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L423" class="LineNr">423 </span><span class="Normal">case</span> <span class="Constant">0xff</span>: <span class="Delimiter">{</span>
-<span id="L424" class="LineNr">424 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L425" class="LineNr">425 </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="L426" class="LineNr">426 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L427" class="LineNr">427 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r/m32</span>
-<span id="L428" class="LineNr">428 </span>      <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L429" class="LineNr">429 </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="L430" class="LineNr">430 </span>      ++*arg<span class="Delimiter">;</span>
-<span id="L431" class="LineNr">431 </span>      <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L432" class="LineNr">432 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L433" class="LineNr">433 </span>    <span class="Delimiter">}</span>
-<span id="L434" class="LineNr">434 </span>    <span class="Comment">// End Op ff Subops</span>
-<span id="L435" class="LineNr">435 </span>  <span class="Delimiter">}</span>
-<span id="L436" class="LineNr">436 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L437" class="LineNr">437 </span><span class="Delimiter">}</span>
-<span id="L438" class="LineNr">438 </span>
-<span id="L439" class="LineNr">439 </span><span class="SalientComment">//:: decrement</span>
-<span id="L440" class="LineNr">440 </span>
-<span id="L441" class="LineNr">441 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L442" class="LineNr">442 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;48&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L443" class="LineNr">443 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;49&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R1 (ECX)&quot;</span><span class="Delimiter">);</span>
-<span id="L444" class="LineNr">444 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R2 (EDX)&quot;</span><span class="Delimiter">);</span>
-<span id="L445" class="LineNr">445 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R3 (EBX)&quot;</span><span class="Delimiter">);</span>
-<span id="L446" class="LineNr">446 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R4 (ESP)&quot;</span><span class="Delimiter">);</span>
-<span id="L447" class="LineNr">447 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R5 (EBP)&quot;</span><span class="Delimiter">);</span>
-<span id="L448" class="LineNr">448 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R6 (ESI)&quot;</span><span class="Delimiter">);</span>
-<span id="L449" class="LineNr">449 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R7 (EDI)&quot;</span><span class="Delimiter">);</span>
+<span id="L385" class="LineNr">385 </span><span class="SalientComment">//:: increment</span>
+<span id="L386" class="LineNr">386 </span>
+<span id="L387" class="LineNr">387 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L388" class="LineNr">388 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;40&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L389" class="LineNr">389 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;41&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R1 (ECX)&quot;</span><span class="Delimiter">);</span>
+<span id="L390" class="LineNr">390 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;42&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R2 (EDX)&quot;</span><span class="Delimiter">);</span>
+<span id="L391" class="LineNr">391 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;43&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R3 (EBX)&quot;</span><span class="Delimiter">);</span>
+<span id="L392" class="LineNr">392 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;44&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R4 (ESP)&quot;</span><span class="Delimiter">);</span>
+<span id="L393" class="LineNr">393 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;45&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R5 (EBP)&quot;</span><span class="Delimiter">);</span>
+<span id="L394" class="LineNr">394 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;46&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R6 (ESI)&quot;</span><span class="Delimiter">);</span>
+<span id="L395" class="LineNr">395 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;47&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R7 (EDI)&quot;</span><span class="Delimiter">);</span>
+<span id="L396" class="LineNr">396 </span>
+<span id="L397" class="LineNr">397 </span><span class="Delimiter">:(scenario increment_r32)</span>
+<span id="L398" class="LineNr">398 </span><span class="Special">% Reg[ECX].u = 0x1f;</span>
+<span id="L399" class="LineNr">399 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L400" class="LineNr">400 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L401" class="LineNr">401 </span>  <span class="Constant">41</span>                                          <span class="Comment"># increment ECX</span>
+<span id="L402" class="LineNr">402 </span><span class="traceContains">+run: increment <a href='010---vm.cc.html#L14'>ECX</a></span>
+<span id="L403" class="LineNr">403 </span><span class="traceContains">+run: storing value 0x00000020</span>
+<span id="L404" class="LineNr">404 </span>
+<span id="L405" class="LineNr">405 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L406" class="LineNr">406 </span><span class="Normal">case</span> <span class="Constant">0x40</span>:
+<span id="L407" class="LineNr">407 </span><span class="Normal">case</span> <span class="Constant">0x41</span>:
+<span id="L408" class="LineNr">408 </span><span class="Normal">case</span> <span class="Constant">0x42</span>:
+<span id="L409" class="LineNr">409 </span><span class="Normal">case</span> <span class="Constant">0x43</span>:
+<span id="L410" class="LineNr">410 </span><span class="Normal">case</span> <span class="Constant">0x44</span>:
+<span id="L411" class="LineNr">411 </span><span class="Normal">case</span> <span class="Constant">0x45</span>:
+<span id="L412" class="LineNr">412 </span><span class="Normal">case</span> <span class="Constant">0x46</span>:
+<span id="L413" class="LineNr">413 </span><span class="Normal">case</span> <span class="Constant">0x47</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r32</span>
+<span id="L414" class="LineNr">414 </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="L415" class="LineNr">415 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L416" class="LineNr">416 </span>  ++Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L417" class="LineNr">417 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[reg]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L418" class="LineNr">418 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L419" class="LineNr">419 </span><span class="Delimiter">}</span>
+<span id="L420" class="LineNr">420 </span>
+<span id="L421" class="LineNr">421 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L422" class="LineNr">422 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;inc/dec/jump/push/call rm32 based on subop&quot;</span><span class="Delimiter">);</span>
+<span id="L423" class="LineNr">423 </span>
+<span id="L424" class="LineNr">424 </span><span class="Delimiter">:(scenario increment_rm32)</span>
+<span id="L425" class="LineNr">425 </span><span class="Special">% Reg[EAX].u = 0x20;</span>
+<span id="L426" class="LineNr">426 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L427" class="LineNr">427 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L428" class="LineNr">428 </span>  ff  c0                                      <span class="Comment"># increment EAX</span>
+<span id="L429" class="LineNr">429 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 000 (subop inc) 000 (EAX)</span>
+<span id="L430" class="LineNr">430 </span><span class="traceContains">+run: increment r/m32</span>
+<span id="L431" class="LineNr">431 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L432" class="LineNr">432 </span><span class="traceContains">+run: storing value 0x00000021</span>
+<span id="L433" class="LineNr">433 </span>
+<span id="L434" class="LineNr">434 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L435" class="LineNr">435 </span><span class="Normal">case</span> <span class="Constant">0xff</span>: <span class="Delimiter">{</span>
+<span id="L436" class="LineNr">436 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L437" class="LineNr">437 </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="L438" class="LineNr">438 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L439" class="LineNr">439 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r/m32</span>
+<span id="L440" class="LineNr">440 </span>      <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L441" class="LineNr">441 </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="L442" class="LineNr">442 </span>      ++*arg<span class="Delimiter">;</span>
+<span id="L443" class="LineNr">443 </span>      <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L444" class="LineNr">444 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L445" class="LineNr">445 </span>    <span class="Delimiter">}</span>
+<span id="L446" class="LineNr">446 </span>    <span class="Comment">// End Op ff Subops</span>
+<span id="L447" class="LineNr">447 </span>  <span class="Delimiter">}</span>
+<span id="L448" class="LineNr">448 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L449" class="LineNr">449 </span><span class="Delimiter">}</span>
 <span id="L450" class="LineNr">450 </span>
-<span id="L451" class="LineNr">451 </span><span class="Delimiter">:(scenario decrement_r32)</span>
-<span id="L452" class="LineNr">452 </span><span class="Special">% Reg[ECX].u = 0x1f;</span>
-<span id="L453" class="LineNr">453 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L454" class="LineNr">454 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L455" class="LineNr">455 </span>  <span class="Constant">49</span>                                          <span class="Comment"># decrement ECX</span>
-<span id="L456" class="LineNr">456 </span><span class="traceContains">+run: decrement <a href='010---vm.cc.html#L14'>ECX</a></span>
-<span id="L457" class="LineNr">457 </span><span class="traceContains">+run: storing value 0x0000001e</span>
-<span id="L458" class="LineNr">458 </span>
-<span id="L459" class="LineNr">459 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L460" class="LineNr">460 </span><span class="Normal">case</span> <span class="Constant">0x48</span>:
-<span id="L461" class="LineNr">461 </span><span class="Normal">case</span> <span class="Constant">0x49</span>:
-<span id="L462" class="LineNr">462 </span><span class="Normal">case</span> <span class="Constant">0x4a</span>:
-<span id="L463" class="LineNr">463 </span><span class="Normal">case</span> <span class="Constant">0x4b</span>:
-<span id="L464" class="LineNr">464 </span><span class="Normal">case</span> <span class="Constant">0x4c</span>:
-<span id="L465" class="LineNr">465 </span><span class="Normal">case</span> <span class="Constant">0x4d</span>:
-<span id="L466" class="LineNr">466 </span><span class="Normal">case</span> <span class="Constant">0x4e</span>:
-<span id="L467" class="LineNr">467 </span><span class="Normal">case</span> <span class="Constant">0x4f</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r32</span>
-<span id="L468" class="LineNr">468 </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="L469" class="LineNr">469 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L470" class="LineNr">470 </span>  --Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L471" class="LineNr">471 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[reg]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L472" class="LineNr">472 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L473" class="LineNr">473 </span><span class="Delimiter">}</span>
-<span id="L474" class="LineNr">474 </span>
-<span id="L475" class="LineNr">475 </span><span class="Delimiter">:(scenario decrement_rm32)</span>
-<span id="L476" class="LineNr">476 </span><span class="Special">% Reg[EAX].u = 0x20;</span>
-<span id="L477" class="LineNr">477 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L478" class="LineNr">478 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L479" class="LineNr">479 </span>  ff  c8                                      <span class="Comment"># decrement EAX</span>
-<span id="L480" class="LineNr">480 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (subop inc) 000 (EAX)</span>
-<span id="L481" class="LineNr">481 </span><span class="traceContains">+run: decrement r/m32</span>
-<span id="L482" class="LineNr">482 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L483" class="LineNr">483 </span><span class="traceContains">+run: storing value 0x0000001f</span>
-<span id="L484" class="LineNr">484 </span>
-<span id="L485" class="LineNr">485 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
-<span id="L486" class="LineNr">486 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r/m32</span>
-<span id="L487" class="LineNr">487 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L488" class="LineNr">488 </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="L489" class="LineNr">489 </span>  --*arg<span class="Delimiter">;</span>
-<span id="L490" class="LineNr">490 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L491" class="LineNr">491 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L492" class="LineNr">492 </span><span class="Delimiter">}</span>
-<span id="L493" class="LineNr">493 </span>
-<span id="L494" class="LineNr">494 </span><span class="SalientComment">//:: push</span>
-<span id="L495" class="LineNr">495 </span>
-<span id="L496" class="LineNr">496 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L497" class="LineNr">497 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R0 (EAX) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L498" class="LineNr">498 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R1 (ECX) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L499" class="LineNr">499 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R2 (EDX) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L500" class="LineNr">500 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R3 (EBX) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L501" class="LineNr">501 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R4 (ESP) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L502" class="LineNr">502 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R5 (EBP) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L503" class="LineNr">503 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R6 (ESI) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L504" class="LineNr">504 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R7 (EDI) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L451" class="LineNr">451 </span><span class="SalientComment">//:: decrement</span>
+<span id="L452" class="LineNr">452 </span>
+<span id="L453" class="LineNr">453 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L454" class="LineNr">454 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;48&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L455" class="LineNr">455 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;49&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R1 (ECX)&quot;</span><span class="Delimiter">);</span>
+<span id="L456" class="LineNr">456 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R2 (EDX)&quot;</span><span class="Delimiter">);</span>
+<span id="L457" class="LineNr">457 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R3 (EBX)&quot;</span><span class="Delimiter">);</span>
+<span id="L458" class="LineNr">458 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R4 (ESP)&quot;</span><span class="Delimiter">);</span>
+<span id="L459" class="LineNr">459 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R5 (EBP)&quot;</span><span class="Delimiter">);</span>
+<span id="L460" class="LineNr">460 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R6 (ESI)&quot;</span><span class="Delimiter">);</span>
+<span id="L461" class="LineNr">461 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R7 (EDI)&quot;</span><span class="Delimiter">);</span>
+<span id="L462" class="LineNr">462 </span>
+<span id="L463" class="LineNr">463 </span><span class="Delimiter">:(scenario decrement_r32)</span>
+<span id="L464" class="LineNr">464 </span><span class="Special">% Reg[ECX].u = 0x1f;</span>
+<span id="L465" class="LineNr">465 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L466" class="LineNr">466 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L467" class="LineNr">467 </span>  <span class="Constant">49</span>                                          <span class="Comment"># decrement ECX</span>
+<span id="L468" class="LineNr">468 </span><span class="traceContains">+run: decrement <a href='010---vm.cc.html#L14'>ECX</a></span>
+<span id="L469" class="LineNr">469 </span><span class="traceContains">+run: storing value 0x0000001e</span>
+<span id="L470" class="LineNr">470 </span>
+<span id="L471" class="LineNr">471 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L472" class="LineNr">472 </span><span class="Normal">case</span> <span class="Constant">0x48</span>:
+<span id="L473" class="LineNr">473 </span><span class="Normal">case</span> <span class="Constant">0x49</span>:
+<span id="L474" class="LineNr">474 </span><span class="Normal">case</span> <span class="Constant">0x4a</span>:
+<span id="L475" class="LineNr">475 </span><span class="Normal">case</span> <span class="Constant">0x4b</span>:
+<span id="L476" class="LineNr">476 </span><span class="Normal">case</span> <span class="Constant">0x4c</span>:
+<span id="L477" class="LineNr">477 </span><span class="Normal">case</span> <span class="Constant">0x4d</span>:
+<span id="L478" class="LineNr">478 </span><span class="Normal">case</span> <span class="Constant">0x4e</span>:
+<span id="L479" class="LineNr">479 </span><span class="Normal">case</span> <span class="Constant">0x4f</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r32</span>
+<span id="L480" class="LineNr">480 </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="L481" class="LineNr">481 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L482" class="LineNr">482 </span>  --Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L483" class="LineNr">483 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[reg]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L484" class="LineNr">484 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L485" class="LineNr">485 </span><span class="Delimiter">}</span>
+<span id="L486" class="LineNr">486 </span>
+<span id="L487" class="LineNr">487 </span><span class="Delimiter">:(scenario decrement_rm32)</span>
+<span id="L488" class="LineNr">488 </span><span class="Special">% Reg[EAX].u = 0x20;</span>
+<span id="L489" class="LineNr">489 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L490" class="LineNr">490 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L491" class="LineNr">491 </span>  ff  c8                                      <span class="Comment"># decrement EAX</span>
+<span id="L492" class="LineNr">492 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (subop inc) 000 (EAX)</span>
+<span id="L493" class="LineNr">493 </span><span class="traceContains">+run: decrement r/m32</span>
+<span id="L494" class="LineNr">494 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L495" class="LineNr">495 </span><span class="traceContains">+run: storing value 0x0000001f</span>
+<span id="L496" class="LineNr">496 </span>
+<span id="L497" class="LineNr">497 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
+<span id="L498" class="LineNr">498 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r/m32</span>
+<span id="L499" class="LineNr">499 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L500" class="LineNr">500 </span>  <span class="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="L501" class="LineNr">501 </span>  --*arg<span class="Delimiter">;</span>
+<span id="L502" class="LineNr">502 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L503" class="LineNr">503 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L504" class="LineNr">504 </span><span class="Delimiter">}</span>
 <span id="L505" class="LineNr">505 </span>
-<span id="L506" class="LineNr">506 </span><span class="Delimiter">:(scenario push_r32)</span>
-<span id="L507" class="LineNr">507 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L508" class="LineNr">508 </span><span class="Special">% Reg[EBX].i = 0x0000000a;</span>
-<span id="L509" class="LineNr">509 </span>== <span class="Constant">0x1</span>
-<span id="L510" class="LineNr">510 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L511" class="LineNr">511 </span>  <span class="Constant">53</span>                                          <span class="Comment"># push EBX to stack</span>
-<span id="L512" class="LineNr">512 </span><span class="traceContains">+run: <a href='012elf.cc.html#L85'>push</a> <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L513" class="LineNr">513 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span>
-<span id="L514" class="LineNr">514 </span><span class="traceContains">+run: pushing value 0x0000000a</span>
-<span id="L515" class="LineNr">515 </span>
-<span id="L516" class="LineNr">516 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L517" class="LineNr">517 </span><span class="Normal">case</span> <span class="Constant">0x50</span>:
-<span id="L518" class="LineNr">518 </span><span class="Normal">case</span> <span class="Constant">0x51</span>:
-<span id="L519" class="LineNr">519 </span><span class="Normal">case</span> <span class="Constant">0x52</span>:
-<span id="L520" class="LineNr">520 </span><span class="Normal">case</span> <span class="Constant">0x53</span>:
-<span id="L521" class="LineNr">521 </span><span class="Normal">case</span> <span class="Constant">0x54</span>:
-<span id="L522" class="LineNr">522 </span><span class="Normal">case</span> <span class="Constant">0x55</span>:
-<span id="L523" class="LineNr">523 </span><span class="Normal">case</span> <span class="Constant">0x56</span>:
-<span id="L524" class="LineNr">524 </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="L525" class="LineNr">525 </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="L526" class="LineNr">526 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L527" class="LineNr">527 </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="L528" class="LineNr">528 </span>  <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L529" class="LineNr">529 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L530" class="LineNr">530 </span><span class="Delimiter">}</span>
-<span id="L531" class="LineNr">531 </span>
-<span id="L532" class="LineNr">532 </span><span class="SalientComment">//:: pop</span>
-<span id="L533" class="LineNr">533 </span>
-<span id="L534" class="LineNr">534 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L535" class="LineNr">535 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L536" class="LineNr">536 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R1 (ECX)&quot;</span><span class="Delimiter">);</span>
-<span id="L537" class="LineNr">537 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R2 (EDX)&quot;</span><span class="Delimiter">);</span>
-<span id="L538" class="LineNr">538 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R3 (EBX)&quot;</span><span class="Delimiter">);</span>
-<span id="L539" class="LineNr">539 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R4 (ESP)&quot;</span><span class="Delimiter">);</span>
-<span id="L540" class="LineNr">540 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R5 (EBP)&quot;</span><span class="Delimiter">);</span>
-<span id="L541" class="LineNr">541 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R6 (ESI)&quot;</span><span class="Delimiter">);</span>
-<span id="L542" class="LineNr">542 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R7 (EDI)&quot;</span><span class="Delimiter">);</span>
+<span id="L506" class="LineNr">506 </span><span class="SalientComment">//:: push</span>
+<span id="L507" class="LineNr">507 </span>
+<span id="L508" class="LineNr">508 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L509" class="LineNr">509 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R0 (EAX) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L510" class="LineNr">510 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R1 (ECX) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L511" class="LineNr">511 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R2 (EDX) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L512" class="LineNr">512 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R3 (EBX) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L513" class="LineNr">513 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R4 (ESP) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L514" class="LineNr">514 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R5 (EBP) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L515" class="LineNr">515 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R6 (ESI) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L516" class="LineNr">516 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R7 (EDI) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L517" class="LineNr">517 </span>
+<span id="L518" class="LineNr">518 </span><span class="Delimiter">:(scenario push_r32)</span>
+<span id="L519" class="LineNr">519 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
+<span id="L520" class="LineNr">520 </span><span class="Special">% Reg[EBX].i = 0x0000000a;</span>
+<span id="L521" class="LineNr">521 </span>== <span class="Constant">0x1</span>
+<span id="L522" class="LineNr">522 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L523" class="LineNr">523 </span>  <span class="Constant">53</span>                                          <span class="Comment"># push EBX to stack</span>
+<span id="L524" class="LineNr">524 </span><span class="traceContains">+run: <a href='012elf.cc.html#L85'>push</a> <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L525" class="LineNr">525 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span>
+<span id="L526" class="LineNr">526 </span><span class="traceContains">+run: pushing value 0x0000000a</span>
+<span id="L527" class="LineNr">527 </span>
+<span id="L528" class="LineNr">528 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L529" class="LineNr">529 </span><span class="Normal">case</span> <span class="Constant">0x50</span>:
+<span id="L530" class="LineNr">530 </span><span class="Normal">case</span> <span class="Constant">0x51</span>:
+<span id="L531" class="LineNr">531 </span><span class="Normal">case</span> <span class="Constant">0x52</span>:
+<span id="L532" class="LineNr">532 </span><span class="Normal">case</span> <span class="Constant">0x53</span>:
+<span id="L533" class="LineNr">533 </span><span class="Normal">case</span> <span class="Constant">0x54</span>:
+<span id="L534" class="LineNr">534 </span><span class="Normal">case</span> <span class="Constant">0x55</span>:
+<span id="L535" class="LineNr">535 </span><span class="Normal">case</span> <span class="Constant">0x56</span>:
+<span id="L536" class="LineNr">536 </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="L537" class="LineNr">537 </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="L538" class="LineNr">538 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L539" class="LineNr">539 </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="L540" class="LineNr">540 </span>  <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L541" class="LineNr">541 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L542" class="LineNr">542 </span><span class="Delimiter">}</span>
 <span id="L543" class="LineNr">543 </span>
-<span id="L544" class="LineNr">544 </span><span class="Delimiter">:(scenario pop_r32)</span>
-<span id="L545" class="LineNr">545 </span><span class="Special">% Reg[ESP].u = 0x60;</span>
-<span id="L546" class="LineNr">546 </span><span class="Special">% write_mem_i32(0x60, 0x0000000a);</span>
-<span id="L547" class="LineNr">547 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L548" class="LineNr">548 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L549" class="LineNr">549 </span>  5b                                          <span class="Comment"># pop stack to EBX</span>
-<span id="L550" class="LineNr">550 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L551" class="LineNr">551 </span>0a <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0x0a</span>
-<span id="L552" class="LineNr">552 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L573'>pop</a> into <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L553" class="LineNr">553 </span><span class="traceContains">+run: popping value 0x0000000a</span>
-<span id="L554" class="LineNr">554 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000064</span>
+<span id="L544" class="LineNr">544 </span><span class="SalientComment">//:: pop</span>
+<span id="L545" class="LineNr">545 </span>
+<span id="L546" class="LineNr">546 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L547" class="LineNr">547 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L548" class="LineNr">548 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R1 (ECX)&quot;</span><span class="Delimiter">);</span>
+<span id="L549" class="LineNr">549 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R2 (EDX)&quot;</span><span class="Delimiter">);</span>
+<span id="L550" class="LineNr">550 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R3 (EBX)&quot;</span><span class="Delimiter">);</span>
+<span id="L551" class="LineNr">551 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R4 (ESP)&quot;</span><span class="Delimiter">);</span>
+<span id="L552" class="LineNr">552 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R5 (EBP)&quot;</span><span class="Delimiter">);</span>
+<span id="L553" class="LineNr">553 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R6 (ESI)&quot;</span><span class="Delimiter">);</span>
+<span id="L554" class="LineNr">554 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R7 (EDI)&quot;</span><span class="Delimiter">);</span>
 <span id="L555" class="LineNr">555 </span>
-<span id="L556" class="LineNr">556 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L557" class="LineNr">557 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
-<span id="L558" class="LineNr">558 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
-<span id="L559" class="LineNr">559 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
-<span id="L560" class="LineNr">560 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
-<span id="L561" class="LineNr">561 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
-<span id="L562" class="LineNr">562 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
-<span id="L563" class="LineNr">563 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
-<span id="L564" class="LineNr">564 </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="L565" class="LineNr">565 </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="L566" class="LineNr">566 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L567" class="LineNr">567 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;pop from &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
-<span id="L568" class="LineNr">568 </span>  Reg[reg]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L573'>pop</a><span class="Delimiter">();</span>
-<span id="L569" class="LineNr">569 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;=&gt; &quot; &lt;&lt; NUM(reg) &lt;&lt; &quot;: &quot; &lt;&lt; Reg[reg].u &lt;&lt; '\n';</span>
-<span id="L570" class="LineNr">570 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L571" class="LineNr">571 </span><span class="Delimiter">}</span>
-<span id="L572" class="LineNr">572 </span><span class="Delimiter">:(code)</span>
-<span id="L573" class="LineNr">573 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L573'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L574" class="LineNr">574 </span>  <span class="Normal">uint32_t</span> result = <a href='010---vm.cc.html#L110'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L575" class="LineNr">575 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;popping value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L576" class="LineNr">576 </span>  Reg[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L577" class="LineNr">577 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L578" class="LineNr">578 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L579" class="LineNr">579 </span><span class="Delimiter">}</span>
+<span id="L556" class="LineNr">556 </span><span class="Delimiter">:(scenario pop_r32)</span>
+<span id="L557" class="LineNr">557 </span><span class="Special">% Reg[ESP].u = 0x60;</span>
+<span id="L558" class="LineNr">558 </span><span class="Special">% write_mem_i32(0x60, 0x0000000a);</span>
+<span id="L559" class="LineNr">559 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L560" class="LineNr">560 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L561" class="LineNr">561 </span>  5b                                          <span class="Comment"># pop stack to EBX</span>
+<span id="L562" class="LineNr">562 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L563" class="LineNr">563 </span>0a <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0x0a</span>
+<span id="L564" class="LineNr">564 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L585'>pop</a> into <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L565" class="LineNr">565 </span><span class="traceContains">+run: popping value 0x0000000a</span>
+<span id="L566" class="LineNr">566 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000064</span>
+<span id="L567" class="LineNr">567 </span>
+<span id="L568" class="LineNr">568 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L569" class="LineNr">569 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
+<span id="L570" class="LineNr">570 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
+<span id="L571" class="LineNr">571 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
+<span id="L572" class="LineNr">572 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
+<span id="L573" class="LineNr">573 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
+<span id="L574" class="LineNr">574 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
+<span id="L575" class="LineNr">575 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
+<span id="L576" class="LineNr">576 </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="L577" class="LineNr">577 </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="L578" class="LineNr">578 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L579" class="LineNr">579 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;pop from &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
+<span id="L580" class="LineNr">580 </span>  Reg[reg]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L585'>pop</a><span class="Delimiter">();</span>
+<span id="L581" class="LineNr">581 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;=&gt; &quot; &lt;&lt; NUM(reg) &lt;&lt; &quot;: &quot; &lt;&lt; Reg[reg].u &lt;&lt; '\n';</span>
+<span id="L582" class="LineNr">582 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L583" class="LineNr">583 </span><span class="Delimiter">}</span>
+<span id="L584" class="LineNr">584 </span><span class="Delimiter">:(code)</span>
+<span id="L585" class="LineNr">585 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L585'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L586" class="LineNr">586 </span>  <span class="Normal">uint32_t</span> result = <a href='010---vm.cc.html#L110'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L587" class="LineNr">587 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;popping value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L588" class="LineNr">588 </span>  Reg[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L589" class="LineNr">589 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L590" class="LineNr">590 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L591" class="LineNr">591 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/014indirect_addressing.cc.html b/html/subx/014indirect_addressing.cc.html
index 1dc22b7e..b3594524 100644
--- a/html/subx/014indirect_addressing.cc.html
+++ b/html/subx/014indirect_addressing.cc.html
@@ -82,7 +82,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#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; Reg[rm]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; Reg[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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L22" class="LineNr"> 22 </span>    addr = Reg[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>
@@ -111,7 +111,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">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L49" class="LineNr"> 49 </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#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add r/m32 to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L50" class="LineNr"> 50 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add 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; <a href='003trace.cc.html#L222'>end</a><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#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[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>
@@ -154,7 +154,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">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L92" class="LineNr"> 92 </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#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract r/m32 from &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L93" class="LineNr"> 93 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;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; <a href='003trace.cc.html#L222'>end</a><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#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[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>
@@ -197,7 +197,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">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L135" class="LineNr">135 </span>  <span class="Normal">uint8_t</span> 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#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L136" class="LineNr">136 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and 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; <a href='003trace.cc.html#L222'>end</a><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#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> Reg[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>
@@ -240,7 +240,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">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L178" class="LineNr">178 </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#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L179" class="LineNr">179 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or 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; <a href='003trace.cc.html#L222'>end</a><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#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[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>
@@ -283,7 +283,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">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L221" class="LineNr">221 </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#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L222" class="LineNr">222 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor 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; <a href='003trace.cc.html#L222'>end</a><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#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[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>
@@ -367,7 +367,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">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L305" class="LineNr">305 </span>  <span class="Normal">uint8_t</span> reg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L306" class="LineNr">306 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L306" class="LineNr">306 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L307" class="LineNr">307 </span>  <span class="Normal">int32_t</span> arg1 = Reg[reg1]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
 <span id="L308" class="LineNr">308 </span>  <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L309" class="LineNr">309 </span>  <span class="Normal">int32_t</span> tmp1 = arg1 - *arg2<span class="Delimiter">;</span>
@@ -439,7 +439,7 @@ 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">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L377" class="LineNr">377 </span>  <span class="Normal">uint8_t</span> reg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L378" class="LineNr">378 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy r/m32 to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L378" class="LineNr">378 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy r/m32 to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L379" class="LineNr">379 </span>  <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L380" class="LineNr">380 </span>  Reg[reg1]<span class="Delimiter">.</span>i = *arg2<span class="Delimiter">;</span>
 <span id="L381" class="LineNr">381 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg2 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
@@ -469,7 +469,7 @@ if ('onhashchange' in window) {
 <span id="L405" class="LineNr">405 </span><span class="Normal">case</span> <span class="Constant">0x88</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r/m8 to r8</span>
 <span id="L406" class="LineNr">406 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L407" class="LineNr">407 </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="L408" class="LineNr">408 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy lowermost byte of &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r8/m8-at-r32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L408" class="LineNr">408 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy lowermost byte of &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r8/m8-at-r32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L409" class="LineNr">409 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
 <span id="L410" class="LineNr">410 </span>  <span class="Normal">uint8_t</span>* arg1 = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
 <span id="L411" class="LineNr">411 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
@@ -501,12 +501,12 @@ if ('onhashchange' in window) {
 <span id="L437" class="LineNr">437 </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="L438" class="LineNr">438 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L439" class="LineNr">439 </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="L440" class="LineNr">440 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy r8/m8-at-r32 to lowermost byte of &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L440" class="LineNr">440 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy r8/m8-at-r32 to lowermost byte of &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L441" class="LineNr">441 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
 <span id="L442" class="LineNr">442 </span>  <span class="Normal">uint8_t</span>* arg2 = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
 <span id="L443" class="LineNr">443 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L259'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span>*arg2<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L444" class="LineNr">444 </span>  *<span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span>&amp;Reg[reg1]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> = *arg2<span class="Delimiter">;</span>  <span class="Comment">// assumes host is little-endian</span>
-<span id="L445" class="LineNr">445 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; now contains 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[reg1]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L445" class="LineNr">445 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; now contains 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[reg1]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L446" class="LineNr">446 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L447" class="LineNr">447 </span><span class="Delimiter">}</span>
 <span id="L448" class="LineNr">448 </span>
@@ -576,7 +576,7 @@ if ('onhashchange' in window) {
 <span id="L512" class="LineNr">512 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (pop r/m32) 000 (dest EAX)</span>
 <span id="L513" class="LineNr">513 </span>== <span class="Constant">0x10</span>  <span class="Comment"># data segment</span>
 <span id="L514" class="LineNr">514 </span><span class="Constant">30</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0x30</span>
-<span id="L515" class="LineNr">515 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L573'>pop</a> into r/m32</span>
+<span id="L515" class="LineNr">515 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L585'>pop</a> into r/m32</span>
 <span id="L516" class="LineNr">516 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
 <span id="L517" class="LineNr">517 </span><span class="traceContains">+run: popping value 0x00000030</span>
 <span id="L518" class="LineNr">518 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000014</span>
@@ -589,7 +589,7 @@ if ('onhashchange' in window) {
 <span id="L525" class="LineNr">525 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>
 <span id="L526" class="LineNr">526 </span>      <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L527" class="LineNr">527 </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="L528" class="LineNr">528 </span>      *dest = <a href='013direct_addressing.cc.html#L573'>pop</a><span class="Delimiter">();</span>
+<span id="L528" class="LineNr">528 </span>      *dest = <a href='013direct_addressing.cc.html#L585'>pop</a><span class="Delimiter">();</span>
 <span id="L529" class="LineNr">529 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L530" class="LineNr">530 </span>    <span class="Delimiter">}</span>
 <span id="L531" class="LineNr">531 </span>  <span class="Delimiter">}</span>
@@ -612,7 +612,7 @@ if ('onhashchange' in window) {
 <span id="L548" class="LineNr">548 </span>
 <span id="L549" class="LineNr">549 </span><span class="Delimiter">:(before &quot;End Mod 0 Special-cases(addr)&quot;)</span>
 <span id="L550" class="LineNr">550 </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="L551" class="LineNr">551 </span>  addr = <a href='011run.cc.html#L302'>next32</a><span class="Delimiter">();</span>
+<span id="L551" class="LineNr">551 </span>  addr = <a href='011run.cc.html#L315'>next32</a><span class="Delimiter">();</span>
 <span id="L552" class="LineNr">552 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L553" class="LineNr">553 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L554" class="LineNr">554 </span>
@@ -637,7 +637,7 @@ if ('onhashchange' in window) {
 <span id="L573" class="LineNr">573 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L574" class="LineNr">574 </span>  <span class="Normal">default</span>:
 <span id="L575" class="LineNr">575 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L576" class="LineNr">576 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L576" class="LineNr">576 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L577" class="LineNr">577 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L578" class="LineNr">578 </span>  <span class="Comment">// End Mod 1 Special-cases(addr)</span>
 <span id="L579" class="LineNr">579 </span>  <span class="Delimiter">}</span>
@@ -682,12 +682,12 @@ if ('onhashchange' in window) {
 <span id="L618" class="LineNr">618 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L619" class="LineNr">619 </span>  <span class="Normal">default</span>:
 <span id="L620" class="LineNr">620 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L621" class="LineNr">621 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L621" class="LineNr">621 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L622" class="LineNr">622 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L623" class="LineNr">623 </span>  <span class="Comment">// End Mod 2 Special-cases(addr)</span>
 <span id="L624" class="LineNr">624 </span>  <span class="Delimiter">}</span>
 <span id="L625" class="LineNr">625 </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="L626" class="LineNr">626 </span>    addr += <a href='011run.cc.html#L302'>next32</a><span class="Delimiter">();</span>
+<span id="L626" class="LineNr">626 </span>    addr += <a href='011run.cc.html#L315'>next32</a><span class="Delimiter">();</span>
 <span id="L627" class="LineNr">627 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp32)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L628" class="LineNr">628 </span>  <span class="Delimiter">}</span>
 <span id="L629" class="LineNr">629 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -705,6 +705,29 @@ if ('onhashchange' in window) {
 <span id="L641" class="LineNr">641 </span><span class="traceContains">+run: effective address is initially 0x61 (EAX)</span>
 <span id="L642" class="LineNr">642 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp32)</span>
 <span id="L643" class="LineNr">643 </span><span class="traceContains">+run: storing 0x00000011</span>
+<span id="L644" class="LineNr">644 </span>
+<span id="L645" class="LineNr">645 </span><span class="SalientComment">//:: lea</span>
+<span id="L646" class="LineNr">646 </span>
+<span id="L647" class="LineNr">647 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L648" class="LineNr">648 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;load effective address of memory in rm32 into r32&quot;</span><span class="Delimiter">);</span>
+<span id="L649" class="LineNr">649 </span>
+<span id="L650" class="LineNr">650 </span><span class="Delimiter">:(scenario lea)</span>
+<span id="L651" class="LineNr">651 </span><span class="Special">% Reg[EAX].u = 0x60;</span>
+<span id="L652" class="LineNr">652 </span>== <span class="Constant">0x1</span>
+<span id="L653" class="LineNr">653 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L654" class="LineNr">654 </span>  8d  <span class="Constant">18</span>
+<span id="L655" class="LineNr">655 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (dest EBX) 000 (src EAX)</span>
+<span id="L656" class="LineNr">656 </span><span class="traceContains">+run: lea into <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L657" class="LineNr">657 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L658" class="LineNr">658 </span>
+<span id="L659" class="LineNr">659 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L660" class="LineNr">660 </span><span class="Normal">case</span> <span class="Constant">0x8d</span>: <span class="Delimiter">{</span>  <span class="Comment">// lea m32 to r32</span>
+<span id="L661" class="LineNr">661 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L662" class="LineNr">662 </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="L663" class="LineNr">663 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;lea 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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L664" class="LineNr">664 </span>  Reg[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="L665" class="LineNr">665 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L666" class="LineNr">666 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/015immediate_addressing.cc.html b/html/subx/015immediate_addressing.cc.html
index bb282579..c94ec957 100644
--- a/html/subx/015immediate_addressing.cc.html
+++ b/html/subx/015immediate_addressing.cc.html
@@ -84,7 +84,7 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr"> 20 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;combine imm32 with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L22" class="LineNr"> 22 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L23" class="LineNr"> 23 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L302'>next32</a><span class="Delimiter">();</span>
+<span id="L23" class="LineNr"> 23 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L315'>next32</a><span class="Delimiter">();</span>
 <span id="L24" class="LineNr"> 24 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
 <span id="L26" class="LineNr"> 26 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -131,7 +131,7 @@ if ('onhashchange' in window) {
 <span id="L67" class="LineNr"> 67 </span>
 <span id="L68" class="LineNr"> 68 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L69" class="LineNr"> 69 </span><span class="Normal">case</span> <span class="Constant">0x2d</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract imm32 from EAX</span>
-<span id="L70" class="LineNr"> 70 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L302'>next32</a><span class="Delimiter">();</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L315'>next32</a><span class="Delimiter">();</span>
 <span id="L71" class="LineNr"> 71 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L72" class="LineNr"> 72 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L73" class="LineNr"> 73 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -189,7 +189,7 @@ if ('onhashchange' in window) {
 <span id="L125" class="LineNr">125 </span>
 <span id="L126" class="LineNr">126 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L127" class="LineNr">127 </span><span class="Normal">case</span> <span class="Constant">0x25</span>: <span class="Delimiter">{</span>  <span class="Comment">// and imm32 with EAX</span>
-<span id="L128" class="LineNr">128 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L302'>next32</a><span class="Delimiter">();</span>
+<span id="L128" class="LineNr">128 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L315'>next32</a><span class="Delimiter">();</span>
 <span id="L129" class="LineNr">129 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L130" class="LineNr">130 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L131" class="LineNr">131 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -247,7 +247,7 @@ if ('onhashchange' in window) {
 <span id="L183" class="LineNr">183 </span>
 <span id="L184" class="LineNr">184 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L185" class="LineNr">185 </span><span class="Normal">case</span> <span class="Constant">0x0d</span>: <span class="Delimiter">{</span>  <span class="Comment">// or imm32 with EAX</span>
-<span id="L186" class="LineNr">186 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L302'>next32</a><span class="Delimiter">();</span>
+<span id="L186" class="LineNr">186 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L315'>next32</a><span class="Delimiter">();</span>
 <span id="L187" class="LineNr">187 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L188" class="LineNr">188 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L189" class="LineNr">189 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -303,7 +303,7 @@ if ('onhashchange' in window) {
 <span id="L239" class="LineNr">239 </span>
 <span id="L240" class="LineNr">240 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L241" class="LineNr">241 </span><span class="Normal">case</span> <span class="Constant">0x35</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor imm32 with EAX</span>
-<span id="L242" class="LineNr">242 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L302'>next32</a><span class="Delimiter">();</span>
+<span id="L242" class="LineNr">242 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L315'>next32</a><span class="Delimiter">();</span>
 <span id="L243" class="LineNr">243 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L244" class="LineNr">244 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L245" class="LineNr">245 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -360,7 +360,7 @@ if ('onhashchange' in window) {
 <span id="L296" class="LineNr">296 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L297" class="LineNr">297 </span><span class="Normal">case</span> <span class="Constant">0x3d</span>: <span class="Delimiter">{</span>  <span class="Comment">// compare EAX with imm32</span>
 <span id="L298" class="LineNr">298 </span>  <span class="Normal">int32_t</span> arg1 = Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L302'>next32</a><span class="Delimiter">();</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L315'>next32</a><span class="Delimiter">();</span>
 <span id="L300" class="LineNr">300 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L301" class="LineNr">301 </span>  <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span>
 <span id="L302" class="LineNr">302 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
@@ -502,8 +502,8 @@ if ('onhashchange' in window) {
 <span id="L438" class="LineNr">438 </span><span class="Normal">case</span> <span class="Constant">0xbe</span>:
 <span id="L439" class="LineNr">439 </span><span class="Normal">case</span> <span class="Constant">0xbf</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
 <span id="L440" class="LineNr">440 </span>  <span class="Normal">uint8_t</span> reg1 = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L441" class="LineNr">441 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L302'>next32</a><span class="Delimiter">();</span>
-<span id="L442" class="LineNr">442 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L441" class="LineNr">441 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L315'>next32</a><span class="Delimiter">();</span>
+<span id="L442" class="LineNr">442 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L443" class="LineNr">443 </span>  Reg[reg1]<span class="Delimiter">.</span>i = arg2<span class="Delimiter">;</span>
 <span id="L444" class="LineNr">444 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L445" class="LineNr">445 </span><span class="Delimiter">}</span>
@@ -528,7 +528,7 @@ if ('onhashchange' in window) {
 <span id="L464" class="LineNr">464 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L465" class="LineNr">465 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L466" class="LineNr">466 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L467" class="LineNr">467 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L302'>next32</a><span class="Delimiter">();</span>
+<span id="L467" class="LineNr">467 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L315'>next32</a><span class="Delimiter">();</span>
 <span id="L468" class="LineNr">468 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L469" class="LineNr">469 </span>  *arg1 = arg2<span class="Delimiter">;</span>
 <span id="L470" class="LineNr">470 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -550,7 +550,7 @@ if ('onhashchange' in window) {
 <span id="L486" class="LineNr">486 </span>
 <span id="L487" class="LineNr">487 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L488" class="LineNr">488 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span>
-<span id="L489" class="LineNr">489 </span>  <span class="Normal">uint32_t</span> val = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L302'>next32</a><span class="Delimiter">());</span>
+<span id="L489" class="LineNr">489 </span>  <span class="Normal">uint32_t</span> val = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L315'>next32</a><span class="Delimiter">());</span>
 <span id="L490" class="LineNr">490 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L491" class="LineNr">491 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: &quot; &lt;&lt; val &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
 <span id="L492" class="LineNr">492 </span>  <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
diff --git a/html/subx/016index_addressing.cc.html b/html/subx/016index_addressing.cc.html
index 0a52a62d..565b5b96 100644
--- a/html/subx/016index_addressing.cc.html
+++ b/html/subx/016index_addressing.cc.html
@@ -88,11 +88,11 @@ 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 = Reg[base]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L29" class="LineNr"> 29 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>base<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L29" class="LineNr"> 29 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>base<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="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#L302'>next32</a><span class="Delimiter">();</span>  <span class="Comment">// ignore base</span>
+<span id="L33" class="LineNr"> 33 </span>    addr = <a href='011run.cc.html#L315'>next32</a><span class="Delimiter">();</span>  <span class="Comment">// ignore base</span>
 <span id="L34" class="LineNr"> 34 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Delimiter">}</span>
 <span id="L36" class="LineNr"> 36 </span>  <span class="Normal">uint8_t</span> index = <span class="Delimiter">(</span>sib&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
@@ -103,7 +103,7 @@ if ('onhashchange' in window) {
 <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">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 += Reg[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#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>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#L262'>NUM</a><span class="Delimiter">(</span>scale<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L44" class="LineNr"> 44 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding &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#L262'>NUM</a><span class="Delimiter">(</span>scale<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="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/019functions.cc.html b/html/subx/019functions.cc.html
index a0845071..5aa8a9e7 100644
--- a/html/subx/019functions.cc.html
+++ b/html/subx/019functions.cc.html
@@ -79,7 +79,7 @@ if ('onhashchange' in window) {
 <span id="L16" class="LineNr">16 </span>
 <span id="L17" class="LineNr">17 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L18" class="LineNr">18 </span><span class="Normal">case</span> <span class="Constant">0xe8</span>: <span class="Delimiter">{</span>  <span class="Comment">// call disp32 relative to next EIP</span>
-<span id="L19" class="LineNr">19 </span>  <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L302'>next32</a><span class="Delimiter">();</span>
+<span id="L19" class="LineNr">19 </span>  <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L315'>next32</a><span class="Delimiter">();</span>
 <span id="L20" class="LineNr">20 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; offset &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L21" class="LineNr">21 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: EIP: &quot; &lt;&lt; EIP &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
 <span id="L22" class="LineNr">22 </span>  <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
@@ -147,7 +147,7 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr">84 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L85" class="LineNr">85 </span><span class="Normal">case</span> <span class="Constant">0xc3</span>: <span class="Delimiter">{</span>  <span class="Comment">// return from a call</span>
 <span id="L86" class="LineNr">86 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;return&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L87" class="LineNr">87 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = <a href='013direct_addressing.cc.html#L573'>pop</a><span class="Delimiter">();</span>
+<span id="L87" class="LineNr">87 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = <a href='013direct_addressing.cc.html#L585'>pop</a><span class="Delimiter">();</span>
 <span id="L88" class="LineNr">88 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L89" class="LineNr">89 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L90" class="LineNr">90 </span><span class="Delimiter">}</span>
diff --git a/html/subx/028translate.cc.html b/html/subx/028translate.cc.html
index 1f60589f..857c1b77 100644
--- a/html/subx/028translate.cc.html
+++ b/html/subx/028translate.cc.html
@@ -89,7 +89,7 @@ if ('onhashchange' in window) {
 <span id="L29" class="LineNr"> 29 </span>  <span class="Delimiter">}</span>
 <span id="L30" class="LineNr"> 30 </span>  <a href='011run.cc.html#L132'>parse</a><span class="Delimiter">(</span>fin<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
 <span id="L31" class="LineNr"> 31 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L32" class="LineNr"> 32 </span>  <a href='011run.cc.html#L196'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L32" class="LineNr"> 32 </span>  <a href='011run.cc.html#L209'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
 <span id="L33" class="LineNr"> 33 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L34" class="LineNr"> 34 </span>  <a href='028translate.cc.html#L41'>save_elf</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> argv[<span class="Constant">3</span>]<span class="Delimiter">);</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> unlink<span class="Delimiter">(</span>argv[<span class="Constant">3</span>]<span class="Delimiter">);</span>
@@ -204,7 +204,7 @@ if ('onhashchange' in window) {
 <span id="L144" class="LineNr">144 </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="L145" class="LineNr">145 </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="L146" class="LineNr">146 </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="L147" class="LineNr">147 </span>      <span class="Normal">uint8_t</span> x = <a href='011run.cc.html#L232'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">).</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>  <span class="Comment">// we're done with metadata by this point</span>
+<span id="L147" class="LineNr">147 </span>      <span class="Normal">uint8_t</span> x = <a href='011run.cc.html#L245'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">).</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>  <span class="Comment">// we're done with metadata by this point</span>
 <span id="L148" class="LineNr">148 </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="L149" class="LineNr">149 </span>    <span class="Delimiter">}</span>
 <span id="L150" class="LineNr">150 </span>  <span class="Delimiter">}</span>
diff --git a/html/subx/030---operands.cc.html b/html/subx/030---operands.cc.html
index e97d633f..0cd8748e 100644
--- a/html/subx/030---operands.cc.html
+++ b/html/subx/030---operands.cc.html
@@ -80,7 +80,7 @@ if ('onhashchange' in window) {
 <span id="L19" class="LineNr"> 19 </span>  <span class="Constant">&quot;Each operand has a type. An instruction won't have more than one operand of</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Constant">&quot;any type.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Constant">&quot;Each instruction has some set of allowed operand types. It'll reject others.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;The complete list of operand <a href='031check_operands.cc.html#L416'>types</a>: mod, subop, r32 (register), rm32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;The complete list of operand <a href='031check_operands.cc.html#L418'>types</a>: mod, subop, r32 (register), rm32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Constant">&quot;(register or memory), scale, index, base, disp8, disp16, disp32, imm8,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Constant">&quot;imm32.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Constant">&quot;Each of these has its own help page. Try reading 'subx help mod' next.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
@@ -198,7 +198,7 @@ if ('onhashchange' in window) {
 <span id="L137" class="LineNr">137 </span>
 <span id="L138" class="LineNr">138 </span><span class="Delimiter">:(after &quot;Begin Transforms&quot;)</span>
 <span id="L139" class="LineNr">139 </span><span class="Comment">// Begin Level-2 Transforms</span>
-<span id="L140" class="LineNr">140 </span><a href='011run.cc.html#L194'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pack_operands<span class="Delimiter">);</span>
+<span id="L140" class="LineNr">140 </span><a href='011run.cc.html#L207'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pack_operands<span class="Delimiter">);</span>
 <span id="L141" class="LineNr">141 </span><span class="Comment">// End Level-2 Transforms</span>
 <span id="L142" class="LineNr">142 </span>
 <span id="L143" class="LineNr">143 </span><span class="Delimiter">:(code)</span>
@@ -242,19 +242,19 @@ if ('onhashchange' in window) {
 <span id="L181" class="LineNr">181 </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="L182" class="LineNr">182 </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="L183" class="LineNr">183 </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="L184" class="LineNr">184 </span>      mod = <a href='011run.cc.html#L232'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L184" class="LineNr">184 </span>      mod = <a href='011run.cc.html#L245'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
 <span id="L185" class="LineNr">185 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L186" class="LineNr">186 </span>    <span class="Delimiter">}</span>
 <span id="L187" class="LineNr">187 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L188" class="LineNr">188 </span>      rm32 = <a href='011run.cc.html#L232'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L188" class="LineNr">188 </span>      rm32 = <a href='011run.cc.html#L245'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
 <span id="L189" class="LineNr">189 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L190" class="LineNr">190 </span>    <span class="Delimiter">}</span>
 <span id="L191" class="LineNr">191 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L192" class="LineNr">192 </span>      reg_subop = <a href='011run.cc.html#L232'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L192" class="LineNr">192 </span>      reg_subop = <a href='011run.cc.html#L245'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
 <span id="L193" class="LineNr">193 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L194" class="LineNr">194 </span>    <span class="Delimiter">}</span>
 <span id="L195" class="LineNr">195 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L196" class="LineNr">196 </span>      reg_subop = <a href='011run.cc.html#L232'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L196" class="LineNr">196 </span>      reg_subop = <a href='011run.cc.html#L245'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
 <span id="L197" class="LineNr">197 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L198" class="LineNr">198 </span>    <span class="Delimiter">}</span>
 <span id="L199" class="LineNr">199 </span>  <span class="Delimiter">}</span>
@@ -268,15 +268,15 @@ if ('onhashchange' in window) {
 <span id="L207" class="LineNr">207 </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="L208" class="LineNr">208 </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="L209" class="LineNr">209 </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="L210" class="LineNr">210 </span>      scale = <a href='011run.cc.html#L232'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L210" class="LineNr">210 </span>      scale = <a href='011run.cc.html#L245'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
 <span id="L211" class="LineNr">211 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L212" class="LineNr">212 </span>    <span class="Delimiter">}</span>
 <span id="L213" class="LineNr">213 </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;index&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L214" class="LineNr">214 </span>      index = <a href='011run.cc.html#L232'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L214" class="LineNr">214 </span>      index = <a href='011run.cc.html#L245'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
 <span id="L215" class="LineNr">215 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L216" class="LineNr">216 </span>    <span class="Delimiter">}</span>
 <span id="L217" class="LineNr">217 </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;base&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L218" class="LineNr">218 </span>      base = <a href='011run.cc.html#L232'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L218" class="LineNr">218 </span>      base = <a href='011run.cc.html#L245'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
 <span id="L219" class="LineNr">219 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L220" class="LineNr">220 </span>    <span class="Delimiter">}</span>
 <span id="L221" class="LineNr">221 </span>  <span class="Delimiter">}</span>
@@ -311,10 +311,10 @@ if ('onhashchange' in window) {
 <span id="L250" class="LineNr">250 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>num == <span class="Constant">1</span> || !is_hex_int<span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L251" class="LineNr">251 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>w<span class="Delimiter">);</span>
 <span id="L252" class="LineNr">252 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L427'>is_hex_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">))</span>
-<span id="L253" class="LineNr">253 </span>      out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L125'>data</a> = <a href='030---operands.cc.html#L274'>hex_byte_to_string</a><span class="Delimiter">(</span><a href='011run.cc.html#L311'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">));</span>
+<span id="L253" class="LineNr">253 </span>      out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L125'>data</a> = <a href='030---operands.cc.html#L274'>hex_byte_to_string</a><span class="Delimiter">(</span><a href='011run.cc.html#L324'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">));</span>
 <span id="L254" class="LineNr">254 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L255" class="LineNr">255 </span>  <span class="Delimiter">}</span>
-<span id="L256" class="LineNr">256 </span>  emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L311'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">)),</span> num<span class="Delimiter">);</span>
+<span id="L256" class="LineNr">256 </span>  emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L324'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">)),</span> num<span class="Delimiter">);</span>
 <span id="L257" class="LineNr">257 </span><span class="Delimiter">}</span>
 <span id="L258" class="LineNr">258 </span>
 <span id="L259" class="LineNr">259 </span><span class="Normal">void</span> emit_hex_bytes<span class="Delimiter">(</span>line&amp; out<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> val<span class="Delimiter">,</span> <span class="Normal">int</span> num<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -376,12 +376,12 @@ if ('onhashchange' in window) {
 <span id="L315" class="LineNr">315 </span>
 <span id="L316" class="LineNr">316 </span><span class="Comment">//: helper for scenario</span>
 <span id="L317" class="LineNr">317 </span><span class="Delimiter">:(code)</span>
-<span id="L318" class="LineNr">318 </span><span class="Normal">void</span> <a href='011run.cc.html#L196'>transform</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L318" class="LineNr">318 </span><span class="Normal">void</span> <a href='011run.cc.html#L209'>transform</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L319" class="LineNr">319 </span>  <a href='011run.cc.html#L99'>program</a> p<span class="Delimiter">;</span>
 <span id="L320" class="LineNr">320 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
 <span id="L321" class="LineNr">321 </span>  <a href='011run.cc.html#L132'>parse</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
 <span id="L322" class="LineNr">322 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L323" class="LineNr">323 </span>  <a href='011run.cc.html#L196'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L323" class="LineNr">323 </span>  <a href='011run.cc.html#L209'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
 <span id="L324" class="LineNr">324 </span><span class="Delimiter">}</span>
 <span id="L325" class="LineNr">325 </span>
 <span id="L326" class="LineNr">326 </span><span class="Delimiter">:(scenario pack_modrm_imm32)</span>
diff --git a/html/subx/031check_operands.cc.html b/html/subx/031check_operands.cc.html
index ce640e7e..69a00ea0 100644
--- a/html/subx/031check_operands.cc.html
+++ b/html/subx/031check_operands.cc.html
@@ -90,18 +90,18 @@ if ('onhashchange' in window) {
 <span id="L26" class="LineNr"> 26 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L27" class="LineNr"> 27 </span>  <a href='011run.cc.html#L123'>word</a> op = <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L29" class="LineNr"> 29 </span>    <a href='031check_operands.cc.html#L502'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L29" class="LineNr"> 29 </span>    <a href='031check_operands.cc.html#L504'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
 <span id="L30" class="LineNr"> 30 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L31" class="LineNr"> 31 </span>  <span class="Delimiter">}</span>
 <span id="L32" class="LineNr"> 32 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L33" class="LineNr"> 33 </span>    <a href='031check_operands.cc.html#L470'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L33" class="LineNr"> 33 </span>    <a href='031check_operands.cc.html#L472'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
 <span id="L34" class="LineNr"> 34 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Delimiter">}</span>
 <span id="L36" class="LineNr"> 36 </span>  check_operands<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
 <span id="L37" class="LineNr"> 37 </span><span class="Delimiter">}</span>
 <span id="L38" class="LineNr"> 38 </span>
 <span id="L39" class="LineNr"> 39 </span><a href='011run.cc.html#L123'>word</a> <a href='031check_operands.cc.html#L39'>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="L40" class="LineNr"> 40 </span>  op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> = <a href='031check_operands.cc.html#L527'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
+<span id="L40" class="LineNr"> 40 </span>  op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> = <a href='031check_operands.cc.html#L529'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
 <span id="L41" class="LineNr"> 41 </span>  <span class="Comment">// opcodes can't be negative</span>
 <span id="L42" class="LineNr"> 42 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span>
 <span id="L43" class="LineNr"> 43 </span>    op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> = op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
@@ -278,329 +278,331 @@ if ('onhashchange' in window) {
 <span id="L214" class="LineNr">214 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
 <span id="L215" class="LineNr">215 </span>  <span class="Comment">// swap</span>
 <span id="L216" class="LineNr">216 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L217" class="LineNr">217 </span>  <span class="Comment">// pop</span>
-<span id="L218" class="LineNr">218 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L219" class="LineNr">219 </span>
-<span id="L220" class="LineNr">220 </span>  <span class="SalientComment">//// Class O: op, ModR/M and subop (not r32)</span>
-<span id="L221" class="LineNr">221 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Comment">//  0     0     0      |0       0     1     1</span>
-<span id="L223" class="LineNr">223 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// test/not/mul/div</span>
-<span id="L224" class="LineNr">224 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// jump/push/call</span>
-<span id="L225" class="LineNr">225 </span>
-<span id="L226" class="LineNr">226 </span>  <span class="SalientComment">//// Class N: op, ModR/M and imm32</span>
-<span id="L227" class="LineNr">227 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L228" class="LineNr">228 </span>  <span class="Comment">//  1     0     0      |0       0     0     1</span>
-<span id="L229" class="LineNr">229 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x41</span><span class="Delimiter">);</span>  <span class="Comment">// copy</span>
-<span id="L230" class="LineNr">230 </span>
-<span id="L231" class="LineNr">231 </span>  <span class="SalientComment">//// Class P: op, ModR/M, subop (not r32) and imm32</span>
-<span id="L232" class="LineNr">232 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L233" class="LineNr">233 </span>  <span class="Comment">//  1     0     0      |0       0     1     1</span>
-<span id="L234" class="LineNr">234 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
-<span id="L235" class="LineNr">235 </span>
-<span id="L236" class="LineNr">236 </span>  <span class="Comment">// End Init Permitted Operands</span>
-<span id="L237" class="LineNr">237 </span><span class="Delimiter">}</span>
-<span id="L238" class="LineNr">238 </span>
-<span id="L239" class="LineNr">239 </span><span class="Delimiter">:(code)</span>
-<span id="L240" class="LineNr">240 </span><span class="Comment">#define HAS(bitvector, bit)  ((bitvector) &amp; (1 &lt;&lt; (bit)))</span>
-<span id="L241" class="LineNr">241 </span><span class="Comment">#define SET(bitvector, bit)  ((bitvector) | (1 &lt;&lt; (bit)))</span>
-<span id="L242" class="LineNr">242 </span><span class="Comment">#define CLEAR(bitvector, bit)  ((bitvector) &amp; (~(1 &lt;&lt; (bit))))</span>
-<span id="L243" class="LineNr">243 </span>
-<span id="L244" class="LineNr">244 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L245" class="LineNr">245 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L246" class="LineNr">246 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
-<span id="L247" class="LineNr">247 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L248" class="LineNr">248 </span>    <a href='031check_operands.cc.html#L340'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L249" class="LineNr">249 </span>    <a href='031check_operands.cc.html#L367'>compare_bitvector_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L250" class="LineNr">250 </span>  <span class="Delimiter">}</span>
-<span id="L251" class="LineNr">251 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L252" class="LineNr">252 </span>    <a href='031check_operands.cc.html#L258'>compare_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L253" class="LineNr">253 </span>  <span class="Delimiter">}</span>
-<span id="L254" class="LineNr">254 </span><span class="Delimiter">}</span>
-<span id="L255" class="LineNr">255 </span>
-<span id="L256" class="LineNr">256 </span><span class="Comment">//: Many instructions can be checked just by comparing bitvectors.</span>
+<span id="L217" class="LineNr">217 </span>  <span class="Comment">// lea</span>
+<span id="L218" class="LineNr">218 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L219" class="LineNr">219 </span>  <span class="Comment">// pop</span>
+<span id="L220" class="LineNr">220 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L221" class="LineNr">221 </span>
+<span id="L222" class="LineNr">222 </span>  <span class="SalientComment">//// Class O: op, ModR/M and subop (not r32)</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     0     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><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// test/not/mul/div</span>
+<span id="L226" class="LineNr">226 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// jump/push/call</span>
+<span id="L227" class="LineNr">227 </span>
+<span id="L228" class="LineNr">228 </span>  <span class="SalientComment">//// Class N: op, ModR/M and imm32</span>
+<span id="L229" class="LineNr">229 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L230" class="LineNr">230 </span>  <span class="Comment">//  1     0     0      |0       0     0     1</span>
+<span id="L231" class="LineNr">231 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x41</span><span class="Delimiter">);</span>  <span class="Comment">// copy</span>
+<span id="L232" class="LineNr">232 </span>
+<span id="L233" class="LineNr">233 </span>  <span class="SalientComment">//// Class P: op, ModR/M, subop (not r32) and imm32</span>
+<span id="L234" class="LineNr">234 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L235" class="LineNr">235 </span>  <span class="Comment">//  1     0     0      |0       0     1     1</span>
+<span id="L236" class="LineNr">236 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
+<span id="L237" class="LineNr">237 </span>
+<span id="L238" class="LineNr">238 </span>  <span class="Comment">// End Init Permitted Operands</span>
+<span id="L239" class="LineNr">239 </span><span class="Delimiter">}</span>
+<span id="L240" class="LineNr">240 </span>
+<span id="L241" class="LineNr">241 </span><span class="Delimiter">:(code)</span>
+<span id="L242" class="LineNr">242 </span><span class="Comment">#define HAS(bitvector, bit)  ((bitvector) &amp; (1 &lt;&lt; (bit)))</span>
+<span id="L243" class="LineNr">243 </span><span class="Comment">#define SET(bitvector, bit)  ((bitvector) | (1 &lt;&lt; (bit)))</span>
+<span id="L244" class="LineNr">244 </span><span class="Comment">#define CLEAR(bitvector, bit)  ((bitvector) &amp; (~(1 &lt;&lt; (bit))))</span>
+<span id="L245" class="LineNr">245 </span>
+<span id="L246" class="LineNr">246 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L247" class="LineNr">247 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L248" class="LineNr">248 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L249" class="LineNr">249 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L250" class="LineNr">250 </span>    <a href='031check_operands.cc.html#L342'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L251" class="LineNr">251 </span>    <a href='031check_operands.cc.html#L369'>compare_bitvector_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L252" class="LineNr">252 </span>  <span class="Delimiter">}</span>
+<span id="L253" class="LineNr">253 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L254" class="LineNr">254 </span>    <a href='031check_operands.cc.html#L260'>compare_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L255" class="LineNr">255 </span>  <span class="Delimiter">}</span>
+<span id="L256" class="LineNr">256 </span><span class="Delimiter">}</span>
 <span id="L257" class="LineNr">257 </span>
-<span id="L258" class="LineNr">258 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L258'>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="L259" class="LineNr">259 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L291'>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="L260" class="LineNr">260 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L282'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L261" class="LineNr">261 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L262" class="LineNr">262 </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="L263" class="LineNr">263 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L264" class="LineNr">264 </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="L265" class="LineNr">265 </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="L266" class="LineNr">266 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L267" class="LineNr">267 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
-<span id="L268" class="LineNr">268 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L276'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L269" class="LineNr">269 </span>    <span class="Normal">else</span>
-<span id="L270" class="LineNr">270 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L276'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L271" class="LineNr">271 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L272" class="LineNr">272 </span>  <span class="Delimiter">}</span>
-<span id="L273" class="LineNr">273 </span>  <span class="Comment">// ignore settings in any unused bits</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>string <a href='031check_operands.cc.html#L276'>maybe_name</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L277" class="LineNr">277 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L278" class="LineNr">278 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L279" class="LineNr">279 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">)</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
-<span id="L280" class="LineNr">280 </span><span class="Delimiter">}</span>
-<span id="L281" class="LineNr">281 </span>
-<span id="L282" class="LineNr">282 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L282'>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="L283" class="LineNr">283 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L284" class="LineNr">284 </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="L285" class="LineNr">285 </span>    bitvector = bitvector | <a href='031check_operands.cc.html#L308'>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="L286" class="LineNr">286 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L93'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L287" class="LineNr">287 </span>  <span class="Delimiter">}</span>
-<span id="L288" class="LineNr">288 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
-<span id="L289" class="LineNr">289 </span><span class="Delimiter">}</span>
-<span id="L290" class="LineNr">290 </span>
-<span id="L291" class="LineNr">291 </span><span class="Normal">bool</span> <a href='031check_operands.cc.html#L291'>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="L292" class="LineNr">292 </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#L295'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L293" class="LineNr">293 </span><span class="Delimiter">}</span>
-<span id="L294" class="LineNr">294 </span>
-<span id="L295" class="LineNr">295 </span><span class="Normal">int</span> <a href='031check_operands.cc.html#L295'>first_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L296" class="LineNr">296 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L297" class="LineNr">297 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;f2&quot;</span> || inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L298" class="LineNr">298 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
-<span id="L299" class="LineNr">299 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
-<span id="L300" class="LineNr">300 </span>    <span class="Normal">else</span>
-<span id="L301" class="LineNr">301 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L302" class="LineNr">302 </span>  <span class="Delimiter">}</span>
-<span id="L303" class="LineNr">303 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L304" class="LineNr">304 </span><span class="Delimiter">}</span>
-<span id="L305" class="LineNr">305 </span>
-<span id="L306" class="LineNr">306 </span><span class="Comment">// Scan the metadata of 'w' and return the bit corresponding to any operand type.</span>
-<span id="L307" class="LineNr">307 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
-<span id="L308" class="LineNr">308 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L308'>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="L309" class="LineNr">309 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L310" class="LineNr">310 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L311" class="LineNr">311 </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="L312" class="LineNr">312 </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="L313" class="LineNr">313 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='031check_operands.cc.html#L73'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
-<span id="L314" class="LineNr">314 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L315" class="LineNr">315 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L316" class="LineNr">316 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L93'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
-<span id="L317" class="LineNr">317 </span>    <span class="Delimiter">}</span>
-<span id="L318" class="LineNr">318 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L73'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">));</span>
-<span id="L319" class="LineNr">319 </span>    found =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L320" class="LineNr">320 </span>  <span class="Delimiter">}</span>
-<span id="L321" class="LineNr">321 </span>  <span class="Identifier">return</span> bv<span class="Delimiter">;</span>
-<span id="L322" class="LineNr">322 </span><span class="Delimiter">}</span>
-<span id="L323" class="LineNr">323 </span>
-<span id="L324" class="LineNr">324 </span><span class="Delimiter">:(scenario conflicting_operand_type)</span>
-<span id="L325" class="LineNr">325 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L326" class="LineNr">326 </span>== <span class="Constant">0x1</span>
-<span id="L327" class="LineNr">327 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
-<span id="L328" class="LineNr">328 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
-<span id="L329" class="LineNr">329 </span>
-<span id="L330" class="LineNr">330 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
-<span id="L331" class="LineNr">331 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
-<span id="L332" class="LineNr">332 </span>
-<span id="L333" class="LineNr">333 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
-<span id="L334" class="LineNr">334 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L335" class="LineNr">335 </span>== <span class="Constant">0x1</span>
-<span id="L336" class="LineNr">336 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop       <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
-<span id="L337" class="LineNr">337 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with imm32 based on subop): missing mod operand</span>
-<span id="L338" class="LineNr">338 </span>
-<span id="L339" class="LineNr">339 </span><span class="Delimiter">:(code)</span>
-<span id="L340" class="LineNr">340 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L340'>check_operands_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L341" class="LineNr">341 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L342" class="LineNr">342 </span>  <a href='031check_operands.cc.html#L387'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L343" class="LineNr">343 </span>  <a href='031check_operands.cc.html#L387'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L344" class="LineNr">344 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
-<span id="L345" class="LineNr">345 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;81&quot;</span> || op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;8f&quot;</span> || op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// keep sync'd with 'help subop'</span>
-<span id="L346" class="LineNr">346 </span>    <a href='031check_operands.cc.html#L387'>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="L347" class="LineNr">347 </span>    <a href='031check_operands.cc.html#L392'>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="L348" class="LineNr">348 </span>  <span class="Delimiter">}</span>
-<span id="L349" class="LineNr">349 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L350" class="LineNr">350 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span><a href='011run.cc.html#L125'>data</a> != <span class="Constant">&quot;4&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Comment">// SIB byte checks</span>
-<span id="L352" class="LineNr">352 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L232'>hex_byte</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
-<span id="L353" class="LineNr">353 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Comment">/*</span><span class="Comment">direct</span><span class="Comment">*/</span><span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L354" class="LineNr">354 </span>    <a href='031check_operands.cc.html#L387'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L355" class="LineNr">355 </span>    <a href='031check_operands.cc.html#L387'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>  <span class="Comment">// otherwise why go to SIB?</span>
-<span id="L356" class="LineNr">356 </span>  <span class="Delimiter">}</span>
-<span id="L357" class="LineNr">357 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L358" class="LineNr">358 </span>    <a href='031check_operands.cc.html#L392'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
-<span id="L359" class="LineNr">359 </span>    <a href='031check_operands.cc.html#L392'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
-<span id="L360" class="LineNr">360 </span>  <span class="Delimiter">}</span>
-<span id="L361" class="LineNr">361 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span>
-<span id="L362" class="LineNr">362 </span><span class="Delimiter">}</span>
-<span id="L363" class="LineNr">363 </span>
-<span id="L364" class="LineNr">364 </span><span class="Comment">// same as compare_bitvector, with a couple of exceptions for modrm-based instructions</span>
-<span id="L365" class="LineNr">365 </span><span class="Comment">//   exception 1: ignore modrm bit since we already checked it above</span>
-<span id="L366" class="LineNr">366 </span><span class="Comment">//   exception 2: modrm instructions can use a displacement on occasion</span>
-<span id="L367" class="LineNr">367 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L367'>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="L368" class="LineNr">368 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L291'>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="L369" class="LineNr">369 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L282'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L370" class="LineNr">370 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L371" class="LineNr">371 </span>  expected = CLEAR<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">);</span>  <span class="Comment">// exception 1</span>
-<span id="L372" class="LineNr">372 </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="L373" class="LineNr">373 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L374" class="LineNr">374 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing for modrm &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
-<span id="L375" class="LineNr">375 </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="L376" class="LineNr">376 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L64'>DISP8</a> || i == <a href='031check_operands.cc.html#L66'>DISP32</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
-<span id="L377" class="LineNr">377 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L378" class="LineNr">378 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
-<span id="L379" class="LineNr">379 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L276'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L380" class="LineNr">380 </span>    <span class="Normal">else</span>
-<span id="L381" class="LineNr">381 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L276'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L382" class="LineNr">382 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L383" class="LineNr">383 </span>  <span class="Delimiter">}</span>
-<span id="L384" class="LineNr">384 </span>  <span class="Comment">// ignore settings in any unused bits</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="Normal">void</span> <a href='031check_operands.cc.html#L387'>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="L388" class="LineNr">388 </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="L389" class="LineNr">389 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): missing &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L390" class="LineNr">390 </span><span class="Delimiter">}</span>
-<span id="L391" class="LineNr">391 </span>
-<span id="L392" class="LineNr">392 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L392'>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="L393" class="LineNr">393 </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="L394" class="LineNr">394 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): unexpected &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand (&quot;</span> &lt;&lt; msg &lt;&lt; <span class="Constant">&quot;)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L395" class="LineNr">395 </span><span class="Delimiter">}</span>
-<span id="L396" class="LineNr">396 </span>
-<span id="L397" class="LineNr">397 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L398" class="LineNr">398 </span><span class="Delimiter">:(scenario modrm_with_displacement)</span>
-<span id="L399" class="LineNr">399 </span><span class="Special">% Reg[EAX].u = 0x1;</span>
-<span id="L400" class="LineNr">400 </span>== <span class="Constant">0x1</span>
-<span id="L401" class="LineNr">401 </span><span class="Comment"># just avoid null pointer</span>
-<span id="L402" class="LineNr">402 </span>8b/copy <span class="Constant">1</span>/mod/lookup+disp8 <span class="Constant">0</span>/rm32/EAX <span class="Constant">2</span>/r32/EDX <span class="Constant">4</span>/disp8  <span class="Comment"># copy *(EAX+4) to EDX</span>
-<span id="L403" class="LineNr">403 </span>$error: <span class="Constant">0</span>
-<span id="L404" class="LineNr">404 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L405" class="LineNr">405 </span>
-<span id="L406" class="LineNr">406 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
-<span id="L407" class="LineNr">407 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L408" class="LineNr">408 </span>== <span class="Constant">0x1</span>
-<span id="L409" class="LineNr">409 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/mod
-<span id="L410" class="LineNr">410 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
-<span id="L411" class="LineNr">411 </span>
-<span id="L412" class="LineNr">412 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
-<span id="L413" class="LineNr">413 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L414" class="LineNr">414 </span>== <span class="Constant">0x1</span>
-<span id="L415" class="LineNr">415 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/r32
-<span id="L416" class="LineNr">416 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
-<span id="L417" class="LineNr">417 </span>
-<span id="L418" class="LineNr">418 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
-<span id="L419" class="LineNr">419 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L420" class="LineNr">420 </span>== <span class="Constant">0x1</span>
-<span id="L421" class="LineNr">421 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod            <span class="Constant">1</span>/imm32
-<span id="L422" class="LineNr">422 </span><span class="traceContains">+error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with imm32 based on subop): missing rm32 operand</span>
-<span id="L423" class="LineNr">423 </span>
-<span id="L424" class="LineNr">424 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
-<span id="L425" class="LineNr">425 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L426" class="LineNr">426 </span>== <span class="Constant">0x1</span>
-<span id="L427" class="LineNr">427 </span><span class="Constant">81</span>             <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
-<span id="L428" class="LineNr">428 </span><span class="traceContains">+error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with imm32 based on subop): missing subop operand</span>
-<span id="L429" class="LineNr">429 </span>
-<span id="L430" class="LineNr">430 </span><span class="Delimiter">:(scenario check_missing_base_operand)</span>
-<span id="L431" class="LineNr">431 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L432" class="LineNr">432 </span>== <span class="Constant">0x1</span>
-<span id="L433" class="LineNr">433 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
-<span id="L434" class="LineNr">434 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with imm32 based on subop): missing base operand</span>
-<span id="L435" class="LineNr">435 </span>
-<span id="L436" class="LineNr">436 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
-<span id="L437" class="LineNr">437 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L438" class="LineNr">438 </span>== <span class="Constant">0x1</span>
-<span id="L439" class="LineNr">439 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">0</span>/base <span class="Constant">1</span>/imm32
-<span id="L440" class="LineNr">440 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32' (combine rm32 with imm32 based on subop): missing index operand</span>
-<span id="L441" class="LineNr">441 </span>
-<span id="L442" class="LineNr">442 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</span>
-<span id="L443" class="LineNr">443 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L444" class="LineNr">444 </span>== <span class="Constant">0x1</span>
-<span id="L445" class="LineNr">445 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">2</span>/index <span class="Constant">3</span>/scale <span class="Constant">1</span>/imm32
-<span id="L446" class="LineNr">446 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32' (combine rm32 with imm32 based on subop): missing base operand</span>
-<span id="L447" class="LineNr">447 </span>
-<span id="L448" class="LineNr">448 </span><span class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
-<span id="L449" class="LineNr">449 </span>== <span class="Constant">0x1</span>
-<span id="L450" class="LineNr">450 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">3</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
-<span id="L451" class="LineNr">451 </span>$error: <span class="Constant">0</span>
-<span id="L452" class="LineNr">452 </span>
-<span id="L453" class="LineNr">453 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
+<span id="L258" class="LineNr">258 </span><span class="Comment">//: Many instructions can be checked just by comparing bitvectors.</span>
+<span id="L259" class="LineNr">259 </span>
+<span id="L260" class="LineNr">260 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L260'>compare_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L261" class="LineNr">261 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L293'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
+<span id="L262" class="LineNr">262 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L284'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L263" class="LineNr">263 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L264" class="LineNr">264 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
+<span id="L265" class="LineNr">265 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L266" class="LineNr">266 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
+<span id="L267" class="LineNr">267 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
+<span id="L268" class="LineNr">268 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L269" class="LineNr">269 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
+<span id="L270" class="LineNr">270 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L278'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L271" class="LineNr">271 </span>    <span class="Normal">else</span>
+<span id="L272" class="LineNr">272 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L278'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L273" class="LineNr">273 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L274" class="LineNr">274 </span>  <span class="Delimiter">}</span>
+<span id="L275" class="LineNr">275 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L276" class="LineNr">276 </span><span class="Delimiter">}</span>
+<span id="L277" class="LineNr">277 </span>
+<span id="L278" class="LineNr">278 </span>string <a href='031check_operands.cc.html#L278'>maybe_name</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L280" class="LineNr">280 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L281" class="LineNr">281 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">)</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
+<span id="L282" class="LineNr">282 </span><span class="Delimiter">}</span>
+<span id="L283" class="LineNr">283 </span>
+<span id="L284" class="LineNr">284 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L284'>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="L285" class="LineNr">285 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L286" class="LineNr">286 </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>    bitvector = bitvector | <a href='031check_operands.cc.html#L310'>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="L288" class="LineNr">288 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L93'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L289" class="LineNr">289 </span>  <span class="Delimiter">}</span>
+<span id="L290" class="LineNr">290 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
+<span id="L291" class="LineNr">291 </span><span class="Delimiter">}</span>
+<span id="L292" class="LineNr">292 </span>
+<span id="L293" class="LineNr">293 </span><span class="Normal">bool</span> <a href='031check_operands.cc.html#L293'>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="L294" class="LineNr">294 </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#L297'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L295" class="LineNr">295 </span><span class="Delimiter">}</span>
+<span id="L296" class="LineNr">296 </span>
+<span id="L297" class="LineNr">297 </span><span class="Normal">int</span> <a href='031check_operands.cc.html#L297'>first_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L298" class="LineNr">298 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;f2&quot;</span> || inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L300" class="LineNr">300 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
+<span id="L301" class="LineNr">301 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
+<span id="L302" class="LineNr">302 </span>    <span class="Normal">else</span>
+<span id="L303" class="LineNr">303 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Delimiter">}</span>
+<span id="L305" class="LineNr">305 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L306" class="LineNr">306 </span><span class="Delimiter">}</span>
+<span id="L307" class="LineNr">307 </span>
+<span id="L308" class="LineNr">308 </span><span class="Comment">// Scan the metadata of 'w' and return the bit corresponding to any operand type.</span>
+<span id="L309" class="LineNr">309 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
+<span id="L310" class="LineNr">310 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L310'>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="L311" class="LineNr">311 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L312" class="LineNr">312 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L313" class="LineNr">313 </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">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="L315" class="LineNr">315 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='031check_operands.cc.html#L73'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
+<span id="L316" class="LineNr">316 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L317" class="LineNr">317 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L318" class="LineNr">318 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L93'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
+<span id="L319" class="LineNr">319 </span>    <span class="Delimiter">}</span>
+<span id="L320" class="LineNr">320 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L73'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">));</span>
+<span id="L321" class="LineNr">321 </span>    found =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L322" class="LineNr">322 </span>  <span class="Delimiter">}</span>
+<span id="L323" class="LineNr">323 </span>  <span class="Identifier">return</span> bv<span class="Delimiter">;</span>
+<span id="L324" class="LineNr">324 </span><span class="Delimiter">}</span>
+<span id="L325" class="LineNr">325 </span>
+<span id="L326" class="LineNr">326 </span><span class="Delimiter">:(scenario conflicting_operand_type)</span>
+<span id="L327" class="LineNr">327 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L328" class="LineNr">328 </span>== <span class="Constant">0x1</span>
+<span id="L329" class="LineNr">329 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
+<span id="L330" class="LineNr">330 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
+<span id="L331" class="LineNr">331 </span>
+<span id="L332" class="LineNr">332 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
+<span id="L333" class="LineNr">333 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
+<span id="L334" class="LineNr">334 </span>
+<span id="L335" class="LineNr">335 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
+<span id="L336" class="LineNr">336 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L337" class="LineNr">337 </span>== <span class="Constant">0x1</span>
+<span id="L338" class="LineNr">338 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop       <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
+<span id="L339" class="LineNr">339 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with imm32 based on subop): missing mod operand</span>
+<span id="L340" class="LineNr">340 </span>
+<span id="L341" class="LineNr">341 </span><span class="Delimiter">:(code)</span>
+<span id="L342" class="LineNr">342 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L342'>check_operands_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L343" class="LineNr">343 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
+<span id="L344" class="LineNr">344 </span>  <a href='031check_operands.cc.html#L389'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L345" class="LineNr">345 </span>  <a href='031check_operands.cc.html#L389'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L346" class="LineNr">346 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
+<span id="L347" class="LineNr">347 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;81&quot;</span> || op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;8f&quot;</span> || op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// keep sync'd with 'help subop'</span>
+<span id="L348" class="LineNr">348 </span>    <a href='031check_operands.cc.html#L389'>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="L349" class="LineNr">349 </span>    <a href='031check_operands.cc.html#L394'>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="L350" class="LineNr">350 </span>  <span class="Delimiter">}</span>
+<span id="L351" class="LineNr">351 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L352" class="LineNr">352 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span><a href='011run.cc.html#L125'>data</a> != <span class="Constant">&quot;4&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L353" class="LineNr">353 </span>  <span class="Comment">// SIB byte checks</span>
+<span id="L354" class="LineNr">354 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L245'>hex_byte</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L355" class="LineNr">355 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Comment">/*</span><span class="Comment">direct</span><span class="Comment">*/</span><span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L356" class="LineNr">356 </span>    <a href='031check_operands.cc.html#L389'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L357" class="LineNr">357 </span>    <a href='031check_operands.cc.html#L389'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>  <span class="Comment">// otherwise why go to SIB?</span>
+<span id="L358" class="LineNr">358 </span>  <span class="Delimiter">}</span>
+<span id="L359" class="LineNr">359 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L360" class="LineNr">360 </span>    <a href='031check_operands.cc.html#L394'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
+<span id="L361" class="LineNr">361 </span>    <a href='031check_operands.cc.html#L394'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
+<span id="L362" class="LineNr">362 </span>  <span class="Delimiter">}</span>
+<span id="L363" class="LineNr">363 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span>
+<span id="L364" class="LineNr">364 </span><span class="Delimiter">}</span>
+<span id="L365" class="LineNr">365 </span>
+<span id="L366" class="LineNr">366 </span><span class="Comment">// same as compare_bitvector, with a couple of exceptions for modrm-based instructions</span>
+<span id="L367" class="LineNr">367 </span><span class="Comment">//   exception 1: ignore modrm bit since we already checked it above</span>
+<span id="L368" class="LineNr">368 </span><span class="Comment">//   exception 2: modrm instructions can use a displacement on occasion</span>
+<span id="L369" class="LineNr">369 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L369'>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="L370" class="LineNr">370 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L293'>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="L371" class="LineNr">371 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L284'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L372" class="LineNr">372 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L373" class="LineNr">373 </span>  expected = CLEAR<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">);</span>  <span class="Comment">// exception 1</span>
+<span id="L374" class="LineNr">374 </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="L375" class="LineNr">375 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L376" class="LineNr">376 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing for modrm &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
+<span id="L377" class="LineNr">377 </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="L378" class="LineNr">378 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L64'>DISP8</a> || i == <a href='031check_operands.cc.html#L66'>DISP32</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
+<span id="L379" class="LineNr">379 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L380" class="LineNr">380 </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="L381" class="LineNr">381 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L278'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L382" class="LineNr">382 </span>    <span class="Normal">else</span>
+<span id="L383" class="LineNr">383 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L278'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L384" class="LineNr">384 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L385" class="LineNr">385 </span>  <span class="Delimiter">}</span>
+<span id="L386" class="LineNr">386 </span>  <span class="Comment">// ignore settings in any unused bits</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><span class="Normal">void</span> <a href='031check_operands.cc.html#L389'>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="L390" class="LineNr">390 </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="L391" class="LineNr">391 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): missing &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L392" class="LineNr">392 </span><span class="Delimiter">}</span>
+<span id="L393" class="LineNr">393 </span>
+<span id="L394" class="LineNr">394 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L394'>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="L395" class="LineNr">395 </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="L396" class="LineNr">396 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): unexpected &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand (&quot;</span> &lt;&lt; msg &lt;&lt; <span class="Constant">&quot;)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L397" class="LineNr">397 </span><span class="Delimiter">}</span>
+<span id="L398" class="LineNr">398 </span>
+<span id="L399" class="LineNr">399 </span><span class="Delimiter">:(scenarios transform)</span>
+<span id="L400" class="LineNr">400 </span><span class="Delimiter">:(scenario modrm_with_displacement)</span>
+<span id="L401" class="LineNr">401 </span><span class="Special">% Reg[EAX].u = 0x1;</span>
+<span id="L402" class="LineNr">402 </span>== <span class="Constant">0x1</span>
+<span id="L403" class="LineNr">403 </span><span class="Comment"># just avoid null pointer</span>
+<span id="L404" class="LineNr">404 </span>8b/copy <span class="Constant">1</span>/mod/lookup+disp8 <span class="Constant">0</span>/rm32/EAX <span class="Constant">2</span>/r32/EDX <span class="Constant">4</span>/disp8  <span class="Comment"># copy *(EAX+4) to EDX</span>
+<span id="L405" class="LineNr">405 </span>$error: <span class="Constant">0</span>
+<span id="L406" class="LineNr">406 </span><span class="Delimiter">:(scenarios run)</span>
+<span id="L407" class="LineNr">407 </span>
+<span id="L408" class="LineNr">408 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
+<span id="L409" class="LineNr">409 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L410" class="LineNr">410 </span>== <span class="Constant">0x1</span>
+<span id="L411" class="LineNr">411 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/mod
+<span id="L412" class="LineNr">412 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
+<span id="L413" class="LineNr">413 </span>
+<span id="L414" class="LineNr">414 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
+<span id="L415" class="LineNr">415 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L416" class="LineNr">416 </span>== <span class="Constant">0x1</span>
+<span id="L417" class="LineNr">417 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/r32
+<span id="L418" class="LineNr">418 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
+<span id="L419" class="LineNr">419 </span>
+<span id="L420" class="LineNr">420 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
+<span id="L421" class="LineNr">421 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L422" class="LineNr">422 </span>== <span class="Constant">0x1</span>
+<span id="L423" class="LineNr">423 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod            <span class="Constant">1</span>/imm32
+<span id="L424" class="LineNr">424 </span><span class="traceContains">+error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with imm32 based on subop): missing rm32 operand</span>
+<span id="L425" class="LineNr">425 </span>
+<span id="L426" class="LineNr">426 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
+<span id="L427" class="LineNr">427 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L428" class="LineNr">428 </span>== <span class="Constant">0x1</span>
+<span id="L429" class="LineNr">429 </span><span class="Constant">81</span>             <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
+<span id="L430" class="LineNr">430 </span><span class="traceContains">+error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with imm32 based on subop): missing subop operand</span>
+<span id="L431" class="LineNr">431 </span>
+<span id="L432" class="LineNr">432 </span><span class="Delimiter">:(scenario check_missing_base_operand)</span>
+<span id="L433" class="LineNr">433 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L434" class="LineNr">434 </span>== <span class="Constant">0x1</span>
+<span id="L435" class="LineNr">435 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
+<span id="L436" class="LineNr">436 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with imm32 based on subop): missing base operand</span>
+<span id="L437" class="LineNr">437 </span>
+<span id="L438" class="LineNr">438 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
+<span id="L439" class="LineNr">439 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L440" class="LineNr">440 </span>== <span class="Constant">0x1</span>
+<span id="L441" class="LineNr">441 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">0</span>/base <span class="Constant">1</span>/imm32
+<span id="L442" class="LineNr">442 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32' (combine rm32 with imm32 based on subop): missing index operand</span>
+<span id="L443" class="LineNr">443 </span>
+<span id="L444" class="LineNr">444 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</span>
+<span id="L445" class="LineNr">445 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L446" class="LineNr">446 </span>== <span class="Constant">0x1</span>
+<span id="L447" class="LineNr">447 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">2</span>/index <span class="Constant">3</span>/scale <span class="Constant">1</span>/imm32
+<span id="L448" class="LineNr">448 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32' (combine rm32 with imm32 based on subop): missing base operand</span>
+<span id="L449" class="LineNr">449 </span>
+<span id="L450" class="LineNr">450 </span><span class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
+<span id="L451" class="LineNr">451 </span>== <span class="Constant">0x1</span>
+<span id="L452" class="LineNr">452 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">3</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
+<span id="L453" class="LineNr">453 </span>$error: <span class="Constant">0</span>
 <span id="L454" class="LineNr">454 </span>
-<span id="L455" class="LineNr">455 </span><span class="Delimiter">:(code)</span>
-<span id="L456" class="LineNr">456 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L502'>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="L457" class="LineNr">457 </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><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
-<span id="L458" class="LineNr">458 </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="L459" class="LineNr">459 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L460" class="LineNr">460 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L461" class="LineNr">461 </span>  <span class="Delimiter">}</span>
-<span id="L462" class="LineNr">462 </span>  <a href='011run.cc.html#L123'>word</a> op = <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
-<span id="L463" class="LineNr">463 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L464" class="LineNr">464 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown 2-byte opcode '0f &quot;</span> &lt;&lt; op<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L465" class="LineNr">465 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L466" class="LineNr">466 </span>  <span class="Delimiter">}</span>
-<span id="L467" class="LineNr">467 </span>  <a href='031check_operands.cc.html#L502'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L468" class="LineNr">468 </span><span class="Delimiter">}</span>
-<span id="L469" class="LineNr">469 </span>
-<span id="L470" class="LineNr">470 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L470'>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="L471" class="LineNr">471 </span>  <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L472" class="LineNr">472 </span><span class="Delimiter">}</span>
-<span id="L473" class="LineNr">473 </span>
-<span id="L474" class="LineNr">474 </span><span class="Delimiter">:(scenario check_missing_disp16_operand)</span>
-<span id="L475" class="LineNr">475 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L476" class="LineNr">476 </span>== <span class="Constant">0x1</span>
-<span id="L477" class="LineNr">477 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L478" class="LineNr">478 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L479" class="LineNr">479 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L480" class="LineNr">480 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                             <span class="Comment"># jmp if ZF to ??</span>
-<span id="L481" class="LineNr">481 </span><span class="traceContains">+error: '0f 84' (jump disp16 bytes away if ZF is set): missing disp16 operand</span>
-<span id="L482" class="LineNr">482 </span>
-<span id="L483" class="LineNr">483 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L484" class="LineNr">484 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <a href='031check_operands.cc.html#L484'>Permitted_operands_0f</a><span class="Delimiter">;</span>
-<span id="L485" class="LineNr">485 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
-<span id="L486" class="LineNr">486 </span><span class="SalientComment">//// Class C: just op and disp16</span>
-<span id="L487" class="LineNr">487 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L488" class="LineNr">488 </span><span class="Comment">//  0     0     0      |1       0     0     0</span>
-<span id="L489" class="LineNr">489 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L484'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L490" class="LineNr">490 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L484'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L491" class="LineNr">491 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L484'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L492" class="LineNr">492 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L484'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L493" class="LineNr">493 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L484'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L494" class="LineNr">494 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L484'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L495" class="LineNr">495 </span>
-<span id="L496" class="LineNr">496 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
-<span id="L497" class="LineNr">497 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L498" class="LineNr">498 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
-<span id="L499" class="LineNr">499 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L484'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L500" class="LineNr">500 </span>
-<span id="L501" class="LineNr">501 </span><span class="Delimiter">:(code)</span>
-<span id="L502" class="LineNr">502 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L502'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L503" class="LineNr">503 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L484'>Permitted_operands_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
-<span id="L504" class="LineNr">504 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">))</span>
-<span id="L505" class="LineNr">505 </span>    <a href='031check_operands.cc.html#L340'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L506" class="LineNr">506 </span>  <a href='031check_operands.cc.html#L509'>compare_bitvector_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> CLEAR<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
-<span id="L507" class="LineNr">507 </span><span class="Delimiter">}</span>
-<span id="L508" class="LineNr">508 </span>
-<span id="L509" class="LineNr">509 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L509'>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="L510" class="LineNr">510 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L291'>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="L511" class="LineNr">511 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L282'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L512" class="LineNr">512 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L513" class="LineNr">513 </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="L514" class="LineNr">514 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L515" class="LineNr">515 </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="L516" class="LineNr">516 </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="L517" class="LineNr">517 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L518" class="LineNr">518 </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="L519" class="LineNr">519 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L520" class="LineNr">520 </span>    <span class="Normal">else</span>
-<span id="L521" class="LineNr">521 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L522" class="LineNr">522 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L523" class="LineNr">523 </span>  <span class="Delimiter">}</span>
-<span id="L524" class="LineNr">524 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L525" class="LineNr">525 </span><span class="Delimiter">}</span>
-<span id="L526" class="LineNr">526 </span>
-<span id="L527" class="LineNr">527 </span>string <a href='031check_operands.cc.html#L527'>tolower</a><span class="Delimiter">(</span><span class="Normal">const</span> <span class="Normal">char</span>* s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L528" class="LineNr">528 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L529" class="LineNr">529 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  *s<span class="Delimiter">;</span>  ++s<span class="Delimiter">)</span>
-<span id="L530" class="LineNr">530 </span>    out &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">char</span>&gt;<span class="Delimiter">(</span><a href='031check_operands.cc.html#L527'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
-<span id="L531" class="LineNr">531 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L532" class="LineNr">532 </span><span class="Delimiter">}</span>
-<span id="L533" class="LineNr">533 </span>
-<span id="L534" class="LineNr">534 </span><span class="Comment">#undef HAS</span>
-<span id="L535" class="LineNr">535 </span><span class="Comment">#undef SET</span>
-<span id="L536" class="LineNr">536 </span><span class="Comment">#undef CLEAR</span>
-<span id="L537" class="LineNr">537 </span>
-<span id="L538" class="LineNr">538 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L539" class="LineNr">539 </span><span class="Comment">#include&lt;cctype&gt;</span>
+<span id="L455" class="LineNr">455 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
+<span id="L456" class="LineNr">456 </span>
+<span id="L457" class="LineNr">457 </span><span class="Delimiter">:(code)</span>
+<span id="L458" class="LineNr">458 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L504'>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="L459" class="LineNr">459 </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><a href='011run.cc.html#L125'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
+<span id="L460" class="LineNr">460 </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="L461" class="LineNr">461 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L462" class="LineNr">462 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L463" class="LineNr">463 </span>  <span class="Delimiter">}</span>
+<span id="L464" class="LineNr">464 </span>  <a href='011run.cc.html#L123'>word</a> op = <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
+<span id="L465" class="LineNr">465 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L466" class="LineNr">466 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown 2-byte opcode '0f &quot;</span> &lt;&lt; op<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L467" class="LineNr">467 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L468" class="LineNr">468 </span>  <span class="Delimiter">}</span>
+<span id="L469" class="LineNr">469 </span>  <a href='031check_operands.cc.html#L504'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L470" class="LineNr">470 </span><span class="Delimiter">}</span>
+<span id="L471" class="LineNr">471 </span>
+<span id="L472" class="LineNr">472 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L472'>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="L473" class="LineNr">473 </span>  <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L474" class="LineNr">474 </span><span class="Delimiter">}</span>
+<span id="L475" class="LineNr">475 </span>
+<span id="L476" class="LineNr">476 </span><span class="Delimiter">:(scenario check_missing_disp16_operand)</span>
+<span id="L477" class="LineNr">477 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L478" class="LineNr">478 </span>== <span class="Constant">0x1</span>
+<span id="L479" class="LineNr">479 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L480" class="LineNr">480 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L481" class="LineNr">481 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L482" class="LineNr">482 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                             <span class="Comment"># jmp if ZF to ??</span>
+<span id="L483" class="LineNr">483 </span><span class="traceContains">+error: '0f 84' (jump disp16 bytes away if ZF is set): missing disp16 operand</span>
+<span id="L484" class="LineNr">484 </span>
+<span id="L485" class="LineNr">485 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L486" class="LineNr">486 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">;</span>
+<span id="L487" class="LineNr">487 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
+<span id="L488" class="LineNr">488 </span><span class="SalientComment">//// Class C: just op and disp16</span>
+<span id="L489" class="LineNr">489 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L490" class="LineNr">490 </span><span class="Comment">//  0     0     0      |1       0     0     0</span>
+<span id="L491" class="LineNr">491 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L492" class="LineNr">492 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L493" class="LineNr">493 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L494" class="LineNr">494 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L495" class="LineNr">495 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L496" class="LineNr">496 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L497" class="LineNr">497 </span>
+<span id="L498" class="LineNr">498 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
+<span id="L499" class="LineNr">499 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L500" class="LineNr">500 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
+<span id="L501" class="LineNr">501 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L502" class="LineNr">502 </span>
+<span id="L503" class="LineNr">503 </span><span class="Delimiter">:(code)</span>
+<span id="L504" class="LineNr">504 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L504'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L505" class="LineNr">505 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L506" class="LineNr">506 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">))</span>
+<span id="L507" class="LineNr">507 </span>    <a href='031check_operands.cc.html#L342'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L508" class="LineNr">508 </span>  <a href='031check_operands.cc.html#L511'>compare_bitvector_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> CLEAR<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
+<span id="L509" class="LineNr">509 </span><span class="Delimiter">}</span>
+<span id="L510" class="LineNr">510 </span>
+<span id="L511" class="LineNr">511 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L511'>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="L512" class="LineNr">512 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L293'>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="L513" class="LineNr">513 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L284'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L514" class="LineNr">514 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L515" class="LineNr">515 </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="L516" class="LineNr">516 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L517" class="LineNr">517 </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="L518" class="LineNr">518 </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="L519" class="LineNr">519 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L520" class="LineNr">520 </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="L521" class="LineNr">521 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L522" class="LineNr">522 </span>    <span class="Normal">else</span>
+<span id="L523" class="LineNr">523 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L524" class="LineNr">524 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L525" class="LineNr">525 </span>  <span class="Delimiter">}</span>
+<span id="L526" class="LineNr">526 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L527" class="LineNr">527 </span><span class="Delimiter">}</span>
+<span id="L528" class="LineNr">528 </span>
+<span id="L529" class="LineNr">529 </span>string <a href='031check_operands.cc.html#L529'>tolower</a><span class="Delimiter">(</span><span class="Normal">const</span> <span class="Normal">char</span>* s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L530" class="LineNr">530 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L531" class="LineNr">531 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  *s<span class="Delimiter">;</span>  ++s<span class="Delimiter">)</span>
+<span id="L532" class="LineNr">532 </span>    out &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">char</span>&gt;<span class="Delimiter">(</span><a href='031check_operands.cc.html#L529'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
+<span id="L533" class="LineNr">533 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L534" class="LineNr">534 </span><span class="Delimiter">}</span>
+<span id="L535" class="LineNr">535 </span>
+<span id="L536" class="LineNr">536 </span><span class="Comment">#undef HAS</span>
+<span id="L537" class="LineNr">537 </span><span class="Comment">#undef SET</span>
+<span id="L538" class="LineNr">538 </span><span class="Comment">#undef CLEAR</span>
+<span id="L539" class="LineNr">539 </span>
+<span id="L540" class="LineNr">540 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L541" class="LineNr">541 </span><span class="Comment">#include&lt;cctype&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/032check_operand_bounds.cc.html b/html/subx/032check_operand_bounds.cc.html
index 12324a67..66ea64bb 100644
--- a/html/subx/032check_operand_bounds.cc.html
+++ b/html/subx/032check_operand_bounds.cc.html
@@ -93,7 +93,7 @@ if ('onhashchange' in window) {
 <span id="L30" class="LineNr">30 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check operand bounds&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L31" class="LineNr">31 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#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#L14'>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#L295'>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#L297'>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="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#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// stop at the first mal-formed instruction</span>
 <span id="L36" class="LineNr">36 </span>  <span class="Delimiter">}</span>
@@ -103,7 +103,7 @@ if ('onhashchange' in window) {
 <span id="L40" class="LineNr">40 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;::iterator p = <a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L41" class="LineNr">41 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_metadata<span class="Delimiter">(</span>w<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L42" class="LineNr">42 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_int<span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// later transforms are on their own to do their own bounds checking</span>
-<span id="L43" class="LineNr">43 </span>    <span class="Normal">int32_t</span> x = <a href='011run.cc.html#L311'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L43" class="LineNr">43 </span>    <span class="Normal">int32_t</span> x = <a href='011run.cc.html#L324'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><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#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' 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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
diff --git a/html/subx/034compute_segment_address.cc.html b/html/subx/034compute_segment_address.cc.html
index 886f0f34..2e73693e 100644
--- a/html/subx/034compute_segment_address.cc.html
+++ b/html/subx/034compute_segment_address.cc.html
@@ -78,7 +78,7 @@ if ('onhashchange' in window) {
 <span id="L17" class="LineNr">17 </span><span class="traceContains">+run: storing 0x0d0c0b0a</span>
 <span id="L18" class="LineNr">18 </span>
 <span id="L19" class="LineNr">19 </span><span class="Delimiter">:(before &quot;End Level-2 Transforms&quot;)</span>
-<span id="L20" class="LineNr">20 </span><a href='011run.cc.html#L194'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L23'>compute_segment_starts</a><span class="Delimiter">);</span>
+<span id="L20" class="LineNr">20 </span><a href='011run.cc.html#L207'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L23'>compute_segment_starts</a><span class="Delimiter">);</span>
 <span id="L21" class="LineNr">21 </span>
 <span id="L22" class="LineNr">22 </span><span class="Delimiter">:(code)</span>
 <span id="L23" class="LineNr">23 </span><span class="Normal">void</span> <a href='034compute_segment_address.cc.html#L23'>compute_segment_starts</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
diff --git a/html/subx/035labels.cc.html b/html/subx/035labels.cc.html
index 182f1d27..de507cf6 100644
--- a/html/subx/035labels.cc.html
+++ b/html/subx/035labels.cc.html
@@ -105,10 +105,10 @@ if ('onhashchange' in window) {
 <span id="L43" class="LineNr"> 43 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L44" class="LineNr"> 44 </span><span class="Normal">loop</span>:
 <span id="L45" class="LineNr"> 45 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
-<span id="L46" class="LineNr"> 46 </span><span class="traceContains">+transform: <a href='003trace.cc.html#L73'>label</a> 'loop' is at address 1</span>
+<span id="L46" class="LineNr"> 46 </span><span class="traceContains">+transform: label 'loop' is at address 1</span>
 <span id="L47" class="LineNr"> 47 </span>
 <span id="L48" class="LineNr"> 48 </span><span class="Delimiter">:(before &quot;End Level-2 Transforms&quot;)</span>
-<span id="L49" class="LineNr"> 49 </span><a href='011run.cc.html#L194'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='035labels.cc.html#L51'>rewrite_labels</a><span class="Delimiter">);</span>
+<span id="L49" class="LineNr"> 49 </span><a href='011run.cc.html#L207'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='035labels.cc.html#L51'>rewrite_labels</a><span class="Delimiter">);</span>
 <span id="L50" class="LineNr"> 50 </span><span class="Delimiter">:(code)</span>
 <span id="L51" class="LineNr"> 51 </span><span class="Normal">void</span> <a href='035labels.cc.html#L51'>rewrite_labels</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L52" class="LineNr"> 52 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- rewrite labels&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
@@ -117,9 +117,9 @@ if ('onhashchange' in window) {
 <span id="L55" class="LineNr"> 55 </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="L56" class="LineNr"> 56 </span>  <a href='035labels.cc.html#L63'>compute_byte_indices_for_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">,</span> byte_index<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#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L58" class="LineNr"> 58 </span>  <a href='035labels.cc.html#L100'>drop_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">);</span>
+<span id="L58" class="LineNr"> 58 </span>  <a href='035labels.cc.html#L110'>drop_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><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#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L60" class="LineNr"> 60 </span>  <a href='035labels.cc.html#L112'>replace_labels_with_displacements</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span>
+<span id="L60" class="LineNr"> 60 </span>  <a href='035labels.cc.html#L122'>replace_labels_with_displacements</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span>
 <span id="L61" class="LineNr"> 61 </span><span class="Delimiter">}</span>
 <span id="L62" class="LineNr"> 62 </span>
 <span id="L63" class="LineNr"> 63 </span><span class="Normal">void</span> <a href='035labels.cc.html#L63'>compute_byte_indices_for_labels</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; <a href='031check_operands.cc.html#L14'>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>
@@ -143,158 +143,168 @@ if ('onhashchange' in window) {
 <span id="L81" class="LineNr"> 81 </span>        ++current_byte<span class="Delimiter">;</span>
 <span id="L82" class="LineNr"> 82 </span>      <span class="Delimiter">}</span>
 <span id="L83" class="LineNr"> 83 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L84" class="LineNr"> 84 </span>        string <a href='003trace.cc.html#L73'>label</a> = <a href='035labels.cc.html#L156'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L84" class="LineNr"> 84 </span>        string label = <a href='035labels.cc.html#L166'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
 <span id="L85" class="LineNr"> 85 </span>        <span class="Comment">// ensure labels look sufficiently different from raw hex</span>
-<span id="L86" class="LineNr"> 86 </span>        <a href='035labels.cc.html#L21'>check_valid_name</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>
+<span id="L86" class="LineNr"> 86 </span>        <a href='035labels.cc.html#L21'>check_valid_name</a><span class="Delimiter">(</span>label<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#L217'>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='030---operands.cc.html#L384'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
-<span id="L89" class="LineNr"> 89 </span>          <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': <a href='003trace.cc.html#L73'>label</a> definition (':') not allowed in operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L89" class="LineNr"> 89 </span>          <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': label definition (':') not allowed in operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L90" class="LineNr"> 90 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
 <span id="L91" class="LineNr"> 91 </span>          <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': labels can only be the first <a href='011run.cc.html#L123'>word</a> in a line.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L92" class="LineNr"> 92 </span>        <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> current_byte<span class="Delimiter">);</span>
-<span id="L93" class="LineNr"> 93 </span>        <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">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><a href='011run.cc.html#L108'>start</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L94" class="LineNr"> 94 </span>        <span class="Comment">// no modifying current_byte; label definitions won't be in the final binary</span>
-<span id="L95" class="LineNr"> 95 </span>      <span class="Delimiter">}</span>
-<span id="L96" class="LineNr"> 96 </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">}</span>
-<span id="L99" class="LineNr"> 99 </span>
-<span id="L100" class="LineNr">100 </span><span class="Normal">void</span> <a href='035labels.cc.html#L100'>drop_labels</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L101" class="LineNr">101 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L102" class="LineNr">102 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>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="L103" class="LineNr">103 </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><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">(),</span> <a href='035labels.cc.html#L108'>is_label</a><span class="Delimiter">);</span>
-<span id="L104" class="LineNr">104 </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><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">());</span>
-<span id="L105" class="LineNr">105 </span>  <span class="Delimiter">}</span>
-<span id="L106" class="LineNr">106 </span><span class="Delimiter">}</span>
-<span id="L107" class="LineNr">107 </span>
-<span id="L108" class="LineNr">108 </span><span class="Normal">bool</span> <a href='035labels.cc.html#L108'>is_label</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L109" class="LineNr">109 </span>  <span class="Identifier">return</span> *w<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">;</span>
-<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='035labels.cc.html#L112'>replace_labels_with_displacements</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L14'>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="L113" class="LineNr">113 </span>  <span class="Normal">int32_t</span> byte_index_next_instruction_starts_at = <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><a href='031check_operands.cc.html#L14'>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="L115" class="LineNr">115 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>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="L116" class="LineNr">116 </span>    byte_index_next_instruction_starts_at += <a href='034compute_segment_address.cc.html#L45'>num_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L117" class="LineNr">117 </span>    <a href='011run.cc.html#L117'>line</a> new_inst<span class="Delimiter">;</span>
-<span id="L118" class="LineNr">118 </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="L119" class="LineNr">119 </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="L120" class="LineNr">120 </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><a href='011run.cc.html#L125'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L121" class="LineNr">121 </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><a href='011run.cc.html#L125'>data</a><span class="Delimiter">))</span> - byte_index_next_instruction_starts_at<span class="Delimiter">;</span>
-<span id="L122" class="LineNr">122 </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="L123" class="LineNr">123 </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="L124" class="LineNr">124 </span>            <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': <a href='003trace.cc.html#L73'>label</a> 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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L125" class="LineNr">125 </span>          <span class="Normal">else</span>
-<span id="L126" class="LineNr">126 </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="L127" class="LineNr">127 </span>        <span class="Delimiter">}</span>
-<span id="L128" class="LineNr">128 </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="L129" class="LineNr">129 </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="L130" class="LineNr">130 </span>            <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': <a href='003trace.cc.html#L73'>label</a> 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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L131" class="LineNr">131 </span>          <span class="Normal">else</span>
-<span id="L132" class="LineNr">132 </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="L133" class="LineNr">133 </span>        <span class="Delimiter">}</span>
-<span id="L134" class="LineNr">134 </span>        <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L135" class="LineNr">135 </span>          emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> displacement<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">);</span>
-<span id="L136" class="LineNr">136 </span>        <span class="Delimiter">}</span>
-<span id="L137" class="LineNr">137 </span>      <span class="Delimiter">}</span>
-<span id="L138" class="LineNr">138 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L139" class="LineNr">139 </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="L140" class="LineNr">140 </span>      <span class="Delimiter">}</span>
-<span id="L141" class="LineNr">141 </span>    <span class="Delimiter">}</span>
-<span id="L142" class="LineNr">142 </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="L143" class="LineNr">143 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L196'>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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L144" class="LineNr">144 </span>  <span class="Delimiter">}</span>
-<span id="L145" class="LineNr">145 </span><span class="Delimiter">}</span>
-<span id="L146" class="LineNr">146 </span>
-<span id="L147" class="LineNr">147 </span>string <a href='035labels.cc.html#L147'>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="L148" class="LineNr">148 </span>  ostringstream out<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>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="L150" class="LineNr">150 </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="L151" class="LineNr">151 </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><a href='011run.cc.html#L125'>data</a><span class="Delimiter">;</span>
-<span id="L152" class="LineNr">152 </span>  <span class="Delimiter">}</span>
-<span id="L153" class="LineNr">153 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L154" class="LineNr">154 </span><span class="Delimiter">}</span>
-<span id="L155" class="LineNr">155 </span>
-<span id="L156" class="LineNr">156 </span>string <a href='035labels.cc.html#L156'>drop_last</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>s<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> --s<span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">());</span>
-<span id="L158" class="LineNr">158 </span><span class="Delimiter">}</span>
-<span id="L159" class="LineNr">159 </span>
-<span id="L160" class="LineNr">160 </span><span class="Comment">//: Label definitions must be the first word on a line. No jumping inside</span>
-<span id="L161" class="LineNr">161 </span><span class="Comment">//: instructions.</span>
-<span id="L162" class="LineNr">162 </span><span class="Comment">//: They should also be the only word on a line.</span>
-<span id="L163" class="LineNr">163 </span><span class="Comment">//: However, you can absolutely have multiple labels map to the same address,</span>
-<span id="L164" class="LineNr">164 </span><span class="Comment">//: as long as they're on separate lines.</span>
+<span id="L92" class="LineNr"> 92 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L103'>Dump_map</a><span class="Delimiter">)</span>
+<span id="L93" class="LineNr"> 93 </span>          cerr &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L108'>start</a> + 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="L94" class="LineNr"> 94 </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="L95" class="LineNr"> 95 </span>        <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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><a href='011run.cc.html#L108'>start</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L96" class="LineNr"> 96 </span>        <span class="Comment">// no modifying current_byte; label definitions won't be in the final binary</span>
+<span id="L97" class="LineNr"> 97 </span>      <span class="Delimiter">}</span>
+<span id="L98" class="LineNr"> 98 </span>    <span class="Delimiter">}</span>
+<span id="L99" class="LineNr"> 99 </span>  <span 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="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L103" class="LineNr">103 </span><span class="Normal">bool</span> <a href='035labels.cc.html#L103'>Dump_map</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// currently used only by 'subx translate'</span>
+<span id="L104" class="LineNr">104 </span><span class="Delimiter">:(before &quot;End Commandline Options&quot;)</span>
+<span id="L105" class="LineNr">105 </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="L106" class="LineNr">106 </span>  <a href='035labels.cc.html#L103'>Dump_map</a> =<span class="Constant"> true</span><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="Delimiter">:(code)</span>
+<span id="L110" class="LineNr">110 </span><span class="Normal">void</span> <a href='035labels.cc.html#L110'>drop_labels</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L111" class="LineNr">111 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L112" class="LineNr">112 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>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="L113" class="LineNr">113 </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><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">(),</span> <a href='035labels.cc.html#L118'>is_label</a><span class="Delimiter">);</span>
+<span id="L114" class="LineNr">114 </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><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">());</span>
+<span id="L115" class="LineNr">115 </span>  <span class="Delimiter">}</span>
+<span id="L116" class="LineNr">116 </span><span class="Delimiter">}</span>
+<span id="L117" class="LineNr">117 </span>
+<span id="L118" class="LineNr">118 </span><span class="Normal">bool</span> <a href='035labels.cc.html#L118'>is_label</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L119" class="LineNr">119 </span>  <span class="Identifier">return</span> *w<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">;</span>
+<span id="L120" class="LineNr">120 </span><span class="Delimiter">}</span>
+<span id="L121" class="LineNr">121 </span>
+<span id="L122" class="LineNr">122 </span><span class="Normal">void</span> <a href='035labels.cc.html#L122'>replace_labels_with_displacements</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L14'>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="L123" class="LineNr">123 </span>  <span class="Normal">int32_t</span> byte_index_next_instruction_starts_at = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L124" class="LineNr">124 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L125" class="LineNr">125 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>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="L126" class="LineNr">126 </span>    byte_index_next_instruction_starts_at += <a href='034compute_segment_address.cc.html#L45'>num_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </span>    <a href='011run.cc.html#L117'>line</a> new_inst<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> 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="L129" class="LineNr">129 </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="L130" class="LineNr">130 </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><a href='011run.cc.html#L125'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L131" class="LineNr">131 </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><a href='011run.cc.html#L125'>data</a><span class="Delimiter">))</span> - byte_index_next_instruction_starts_at<span class="Delimiter">;</span>
+<span id="L132" class="LineNr">132 </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="L133" class="LineNr">133 </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="L134" class="LineNr">134 </span>            <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': 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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L135" class="LineNr">135 </span>          <span class="Normal">else</span>
+<span id="L136" class="LineNr">136 </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="L137" class="LineNr">137 </span>        <span class="Delimiter">}</span>
+<span id="L138" class="LineNr">138 </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="L139" class="LineNr">139 </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="L140" class="LineNr">140 </span>            <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': 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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L141" class="LineNr">141 </span>          <span class="Normal">else</span>
+<span id="L142" class="LineNr">142 </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="L143" class="LineNr">143 </span>        <span class="Delimiter">}</span>
+<span id="L144" class="LineNr">144 </span>        <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L145" class="LineNr">145 </span>          emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> displacement<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span>        <span class="Delimiter">}</span>
+<span id="L147" class="LineNr">147 </span>      <span class="Delimiter">}</span>
+<span id="L148" class="LineNr">148 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L149" class="LineNr">149 </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="L150" class="LineNr">150 </span>      <span class="Delimiter">}</span>
+<span id="L151" class="LineNr">151 </span>    <span class="Delimiter">}</span>
+<span id="L152" class="LineNr">152 </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="L153" class="LineNr">153 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L209'>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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Delimiter">}</span>
+<span id="L155" class="LineNr">155 </span><span class="Delimiter">}</span>
+<span id="L156" class="LineNr">156 </span>
+<span id="L157" class="LineNr">157 </span>string <a href='035labels.cc.html#L157'>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="L158" class="LineNr">158 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L159" class="LineNr">159 </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="L160" class="LineNr">160 </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="L161" class="LineNr">161 </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><a href='011run.cc.html#L125'>data</a><span class="Delimiter">;</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Delimiter">}</span>
+<span id="L163" class="LineNr">163 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L164" class="LineNr">164 </span><span class="Delimiter">}</span>
 <span id="L165" class="LineNr">165 </span>
-<span id="L166" class="LineNr">166 </span><span class="Delimiter">:(scenario multiple_labels_at)</span>
-<span id="L167" class="LineNr">167 </span>== <span class="Constant">0x1</span>
-<span id="L168" class="LineNr">168 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L169" class="LineNr">169 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L170" class="LineNr">170 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L171" class="LineNr">171 </span><span class="Comment"># address 1</span>
-<span id="L172" class="LineNr">172 </span><span class="Normal">loop</span>:
-<span id="L173" class="LineNr">173 </span> $loop2:
-<span id="L174" class="LineNr">174 </span><span class="Comment"># address 1 (labels take up no space)</span>
-<span id="L175" class="LineNr">175 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
-<span id="L176" class="LineNr">176 </span><span class="Comment"># address 6</span>
-<span id="L177" class="LineNr">177 </span>            eb                                                                                                              $loop2/disp8
-<span id="L178" class="LineNr">178 </span><span class="Comment"># address 8</span>
-<span id="L179" class="LineNr">179 </span>            eb                                                                                                              $loop3/disp8
-<span id="L180" class="LineNr">180 </span><span class="Comment"># address 0xa</span>
-<span id="L181" class="LineNr">181 </span> $loop3:
-<span id="L182" class="LineNr">182 </span><span class="traceContains">+transform: <a href='003trace.cc.html#L73'>label</a> 'loop' is at address 1</span>
-<span id="L183" class="LineNr">183 </span><span class="traceContains">+transform: <a href='003trace.cc.html#L73'>label</a> '$loop2' is at address 1</span>
-<span id="L184" class="LineNr">184 </span><span class="traceContains">+transform: <a href='003trace.cc.html#L73'>label</a> '$loop3' is at address a</span>
-<span id="L185" class="LineNr">185 </span><span class="Comment"># first jump is to -7</span>
-<span id="L186" class="LineNr">186 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L196'>transform</a>: 'eb f9'</span>
-<span id="L187" class="LineNr">187 </span><span class="Comment"># second jump is to 0 (fall through)</span>
-<span id="L188" class="LineNr">188 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L196'>transform</a>: 'eb 00'</span>
-<span id="L189" class="LineNr">189 </span>
-<span id="L190" class="LineNr">190 </span><span class="Delimiter">:(scenario label_too_short)</span>
-<span id="L191" class="LineNr">191 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L192" class="LineNr">192 </span>== <span class="Constant">0x1</span>
-<span id="L193" class="LineNr">193 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L194" class="LineNr">194 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L195" class="LineNr">195 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L196" class="LineNr">196 </span><span class="Normal">xz</span>:
-<span id="L197" class="LineNr">197 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
-<span id="L198" class="LineNr">198 </span><span class="traceContains">+error: 'xz' is two characters long which can look like raw hex bytes at a glance; use a different <a href='010---vm.cc.html#L228'>name</a></span>
+<span id="L166" class="LineNr">166 </span>string <a href='035labels.cc.html#L166'>drop_last</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>s<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> --s<span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">());</span>
+<span id="L168" class="LineNr">168 </span><span class="Delimiter">}</span>
+<span id="L169" class="LineNr">169 </span>
+<span id="L170" class="LineNr">170 </span><span class="Comment">//: Label definitions must be the first word on a line. No jumping inside</span>
+<span id="L171" class="LineNr">171 </span><span class="Comment">//: instructions.</span>
+<span id="L172" class="LineNr">172 </span><span class="Comment">//: They should also be the only word on a line.</span>
+<span id="L173" class="LineNr">173 </span><span class="Comment">//: However, you can absolutely have multiple labels map to the same address,</span>
+<span id="L174" class="LineNr">174 </span><span class="Comment">//: as long as they're on separate lines.</span>
+<span id="L175" class="LineNr">175 </span>
+<span id="L176" class="LineNr">176 </span><span class="Delimiter">:(scenario multiple_labels_at)</span>
+<span id="L177" class="LineNr">177 </span>== <span class="Constant">0x1</span>
+<span id="L178" class="LineNr">178 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L179" class="LineNr">179 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L180" class="LineNr">180 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L181" class="LineNr">181 </span><span class="Comment"># address 1</span>
+<span id="L182" class="LineNr">182 </span><span class="Normal">loop</span>:
+<span id="L183" class="LineNr">183 </span> $loop2:
+<span id="L184" class="LineNr">184 </span><span class="Comment"># address 1 (labels take up no space)</span>
+<span id="L185" class="LineNr">185 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
+<span id="L186" class="LineNr">186 </span><span class="Comment"># address 6</span>
+<span id="L187" class="LineNr">187 </span>            eb                                                                                                              $loop2/disp8
+<span id="L188" class="LineNr">188 </span><span class="Comment"># address 8</span>
+<span id="L189" class="LineNr">189 </span>            eb                                                                                                              $loop3/disp8
+<span id="L190" class="LineNr">190 </span><span class="Comment"># address 0xa</span>
+<span id="L191" class="LineNr">191 </span> $loop3:
+<span id="L192" class="LineNr">192 </span><span class="traceContains">+transform: label 'loop' is at address 1</span>
+<span id="L193" class="LineNr">193 </span><span class="traceContains">+transform: label '$loop2' is at address 1</span>
+<span id="L194" class="LineNr">194 </span><span class="traceContains">+transform: label '$loop3' is at address a</span>
+<span id="L195" class="LineNr">195 </span><span class="Comment"># first jump is to -7</span>
+<span id="L196" class="LineNr">196 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L209'>transform</a>: 'eb f9'</span>
+<span id="L197" class="LineNr">197 </span><span class="Comment"># second jump is to 0 (fall through)</span>
+<span id="L198" class="LineNr">198 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L209'>transform</a>: 'eb 00'</span>
 <span id="L199" class="LineNr">199 </span>
-<span id="L200" class="LineNr">200 </span><span class="Delimiter">:(scenario label_hex)</span>
+<span id="L200" class="LineNr">200 </span><span class="Delimiter">:(scenario label_too_short)</span>
 <span id="L201" class="LineNr">201 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L202" class="LineNr">202 </span>== <span class="Constant">0x1</span>
 <span id="L203" class="LineNr">203 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L204" class="LineNr">204 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L205" class="LineNr">205 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L206" class="LineNr">206 </span><span class="Constant">0xab</span>:
+<span id="L206" class="LineNr">206 </span><span class="Normal">xz</span>:
 <span id="L207" class="LineNr">207 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
-<span id="L208" class="LineNr">208 </span><span class="traceContains">+error: '0xab' looks like a hex number; use a different <a href='010---vm.cc.html#L228'>name</a></span>
+<span id="L208" class="LineNr">208 </span><span class="traceContains">+error: 'xz' is two characters long which can look like raw hex bytes at a glance; use a different <a href='010---vm.cc.html#L228'>name</a></span>
 <span id="L209" class="LineNr">209 </span>
-<span id="L210" class="LineNr">210 </span><span class="Delimiter">:(scenario label_negative_hex)</span>
+<span id="L210" class="LineNr">210 </span><span class="Delimiter">:(scenario label_hex)</span>
 <span id="L211" class="LineNr">211 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L212" class="LineNr">212 </span>== <span class="Constant">0x1</span>
 <span id="L213" class="LineNr">213 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L214" class="LineNr">214 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L215" class="LineNr">215 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L216" class="LineNr">216 </span> -a:  <span class="Comment"># indent to avoid looking like a trace_should_not_contain command for this scenario</span>
+<span id="L216" class="LineNr">216 </span><span class="Constant">0xab</span>:
 <span id="L217" class="LineNr">217 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
-<span id="L218" class="LineNr">218 </span><span class="traceContains">+error: '-a' starts with '-', which can be confused with a negative number; use a different <a href='010---vm.cc.html#L228'>name</a></span>
+<span id="L218" class="LineNr">218 </span><span class="traceContains">+error: '0xab' looks like a hex number; use a different <a href='010---vm.cc.html#L228'>name</a></span>
 <span id="L219" class="LineNr">219 </span>
-<span id="L220" class="LineNr">220 </span><span class="Comment">//: now that we have labels, we need to adjust segment size computation to</span>
-<span id="L221" class="LineNr">221 </span><span class="Comment">//: ignore them.</span>
-<span id="L222" class="LineNr">222 </span>
-<span id="L223" class="LineNr">223 </span><span class="Delimiter">:(scenario segment_size_ignores_labels)</span>
-<span id="L224" class="LineNr">224 </span><span class="Special">% Mem_offset = CODE_START;</span>
-<span id="L225" class="LineNr">225 </span>== <a href='031check_operands.cc.html#L14'>code</a>  <span class="Comment"># 0x08048074</span>
-<span id="L226" class="LineNr">226 </span><span class="PreProc">0</span><span class="Constant">5</span>/add <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># 5 bytes</span>
-<span id="L227" class="LineNr">227 </span><span class="Normal">foo</span>:                     <span class="Comment"># 0 bytes</span>
-<span id="L228" class="LineNr">228 </span>== <a href='011run.cc.html#L125'>data</a>  <span class="Comment"># 0x08049079</span>
-<span id="L229" class="LineNr">229 </span><span class="Normal">bar</span>:
-<span id="L230" class="LineNr">230 </span><span class="PreProc">0</span><span class="Constant">0</span>
-<span id="L231" class="LineNr">231 </span><span class="traceContains">+transform: segment 1 begins at address 0x08049079</span>
+<span id="L220" class="LineNr">220 </span><span class="Delimiter">:(scenario label_negative_hex)</span>
+<span id="L221" class="LineNr">221 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L222" class="LineNr">222 </span>== <span class="Constant">0x1</span>
+<span id="L223" class="LineNr">223 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L224" class="LineNr">224 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L225" class="LineNr">225 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L226" class="LineNr">226 </span> -a:  <span class="Comment"># indent to avoid looking like a trace_should_not_contain command for this scenario</span>
+<span id="L227" class="LineNr">227 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
+<span id="L228" class="LineNr">228 </span><span class="traceContains">+error: '-a' starts with '-', which can be confused with a negative number; use a different <a href='010---vm.cc.html#L228'>name</a></span>
+<span id="L229" class="LineNr">229 </span>
+<span id="L230" class="LineNr">230 </span><span class="Comment">//: now that we have labels, we need to adjust segment size computation to</span>
+<span id="L231" class="LineNr">231 </span><span class="Comment">//: ignore them.</span>
 <span id="L232" class="LineNr">232 </span>
-<span id="L233" class="LineNr">233 </span><span class="Delimiter">:(before &quot;End num_bytes(curr) Special-cases&quot;)</span>
-<span id="L234" class="LineNr">234 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L108'>is_label</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
-<span id="L235" class="LineNr">235 </span>  <span class="Delimiter">;</span>  <span class="Comment">// don't count it</span>
+<span id="L233" class="LineNr">233 </span><span class="Delimiter">:(scenario segment_size_ignores_labels)</span>
+<span id="L234" class="LineNr">234 </span><span class="Special">% Mem_offset = CODE_START;</span>
+<span id="L235" class="LineNr">235 </span>== <a href='031check_operands.cc.html#L14'>code</a>  <span class="Comment"># 0x08048074</span>
+<span id="L236" class="LineNr">236 </span><span class="PreProc">0</span><span class="Constant">5</span>/add <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># 5 bytes</span>
+<span id="L237" class="LineNr">237 </span><span class="Normal">foo</span>:                     <span class="Comment"># 0 bytes</span>
+<span id="L238" class="LineNr">238 </span>== <a href='011run.cc.html#L125'>data</a>  <span class="Comment"># 0x08049079</span>
+<span id="L239" class="LineNr">239 </span><span class="Normal">bar</span>:
+<span id="L240" class="LineNr">240 </span><span class="PreProc">0</span><span class="Constant">0</span>
+<span id="L241" class="LineNr">241 </span><span class="traceContains">+transform: segment 1 begins at address 0x08049079</span>
+<span id="L242" class="LineNr">242 </span>
+<span id="L243" class="LineNr">243 </span><span class="Delimiter">:(before &quot;End num_bytes(curr) Special-cases&quot;)</span>
+<span id="L244" class="LineNr">244 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L118'>is_label</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
+<span id="L245" class="LineNr">245 </span>  <span class="Delimiter">;</span>  <span class="Comment">// don't count it</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/036global_variables.cc.html b/html/subx/036global_variables.cc.html
index c37ea272..a386013d 100644
--- a/html/subx/036global_variables.cc.html
+++ b/html/subx/036global_variables.cc.html
@@ -81,7 +81,7 @@ if ('onhashchange' in window) {
 <span id="L17" class="LineNr"> 17 </span><span class="traceContains">+transform: global variable 'x' is at address 0x08049079</span>
 <span id="L18" class="LineNr"> 18 </span>
 <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Level-2 Transforms&quot;)</span>
-<span id="L20" class="LineNr"> 20 </span><a href='011run.cc.html#L194'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='036global_variables.cc.html#L22'>rewrite_global_variables</a><span class="Delimiter">);</span>
+<span id="L20" class="LineNr"> 20 </span><a href='011run.cc.html#L207'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='036global_variables.cc.html#L22'>rewrite_global_variables</a><span class="Delimiter">);</span>
 <span id="L21" class="LineNr"> 21 </span><span class="Delimiter">:(code)</span>
 <span id="L22" class="LineNr"> 22 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L22'>rewrite_global_variables</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L23" class="LineNr"> 23 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- rewrite global variables&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
@@ -107,7 +107,7 @@ if ('onhashchange' in window) {
 <span id="L43" class="LineNr"> 43 </span>        ++current_address<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>        string variable = <a href='035labels.cc.html#L156'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L46" class="LineNr"> 46 </span>        string variable = <a href='035labels.cc.html#L166'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
 <span id="L47" class="LineNr"> 47 </span>        <span class="Comment">// ensure variables look sufficiently different from raw hex</span>
 <span id="L48" class="LineNr"> 48 </span>        <a href='035labels.cc.html#L21'>check_valid_name</a><span class="Delimiter">(</span>variable<span class="Delimiter">);</span>
 <span id="L49" class="LineNr"> 49 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
@@ -123,7 +123,7 @@ if ('onhashchange' in window) {
 <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#L14'>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="L62" class="LineNr"> 62 </span>    <a href='035labels.cc.html#L100'>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="L62" class="LineNr"> 62 </span>    <a href='035labels.cc.html#L110'>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>
@@ -145,7 +145,7 @@ if ('onhashchange' in window) {
 <span id="L81" class="LineNr"> 81 </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><a href='011run.cc.html#L125'>data</a><span class="Delimiter">),</span> <span class="Constant">4</span><span class="Delimiter">);</span>
 <span id="L82" class="LineNr"> 82 </span>    <span class="Delimiter">}</span>
 <span id="L83" class="LineNr"> 83 </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="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L196'>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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L209'>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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L85" class="LineNr"> 85 </span>  <span class="Delimiter">}</span>
 <span id="L86" class="LineNr"> 86 </span><span class="Delimiter">}</span>
 <span id="L87" class="LineNr"> 87 </span>
@@ -159,7 +159,7 @@ if ('onhashchange' in window) {
 <span id="L95" class="LineNr"> 95 </span><span class="Comment">//: requires first saving some data early before we pack operands</span>
 <span id="L96" class="LineNr"> 96 </span>
 <span id="L97" class="LineNr"> 97 </span><span class="Delimiter">:(after &quot;Begin Level-2 Transforms&quot;)</span>
-<span id="L98" class="LineNr"> 98 </span><a href='011run.cc.html#L194'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='036global_variables.cc.html#L100'>correlate_disp32_with_mod</a><span class="Delimiter">);</span>
+<span id="L98" class="LineNr"> 98 </span><a href='011run.cc.html#L207'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='036global_variables.cc.html#L100'>correlate_disp32_with_mod</a><span class="Delimiter">);</span>
 <span id="L99" class="LineNr"> 99 </span><span class="Delimiter">:(code)</span>
 <span id="L100" class="LineNr">100 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L100'>correlate_disp32_with_mod</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L101" class="LineNr">101 </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>
diff --git a/html/subx/038---literal_strings.cc.html b/html/subx/038---literal_strings.cc.html
new file mode 100644
index 00000000..70494c30
--- /dev/null
+++ b/html/subx/038---literal_strings.cc.html
@@ -0,0 +1,281 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/038---literal_strings.cc</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="cpp">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<style type="text/css">
+<!--
+pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+a { color:#eeeeee; text-decoration: none; }
+a:hover { text-decoration: underline; }
+* { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
+.traceAbsent { color: #c00000; }
+.Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.traceContains { color: #008000; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr">  1 </span><span class="Comment">//: Allow instructions to mention literals directly.</span>
+<span id="L2" class="LineNr">  2 </span><span class="Comment">//:</span>
+<span id="L3" class="LineNr">  3 </span><span class="Comment">//: This layer will transparently move them to the global segment (assumed to</span>
+<span id="L4" class="LineNr">  4 </span><span class="Comment">//: always be the second segment).</span>
+<span id="L5" class="LineNr">  5 </span>
+<span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(scenario transform_literal_string)</span>
+<span id="L7" class="LineNr">  7 </span><span class="Special">% Mem_offset = CODE_START;</span>
+<span id="L8" class="LineNr">  8 </span><span class="Special">% Mem.resize(AFTER_STACK - CODE_START);</span>
+<span id="L9" class="LineNr">  9 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L10" class="LineNr"> 10 </span>  b8/copy <span class="Constant">&quot;test&quot;</span>/imm32  <span class="Comment"># copy to EAX</span>
+<span id="L11" class="LineNr"> 11 </span><span class="traceContains">+transform: -- move literal strings to <a href='011run.cc.html#L125'>data</a> segment</span>
+<span id="L12" class="LineNr"> 12 </span><span class="traceContains">+transform: adding global variable '__subx_global_1' containing &quot;test&quot;</span>
+<span id="L13" class="LineNr"> 13 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L209'>transform</a>: 'b8 __subx_global_1'</span>
+<span id="L14" class="LineNr"> 14 </span>
+<span id="L15" class="LineNr"> 15 </span><span class="Comment">//: We don't rely on any transforms running in previous layers, but this layer</span>
+<span id="L16" class="LineNr"> 16 </span><span class="Comment">//: knows about labels and global variables and will emit them for previous</span>
+<span id="L17" class="LineNr"> 17 </span><span class="Comment">//: layers to transform.</span>
+<span id="L18" class="LineNr"> 18 </span><span class="Delimiter">:(after &quot;Begin Transforms&quot;)</span>
+<span id="L19" class="LineNr"> 19 </span><span class="Comment">// Begin Level-3 Transforms</span>
+<span id="L20" class="LineNr"> 20 </span><a href='011run.cc.html#L207'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='038---literal_strings.cc.html#L26'>transform_literal_strings</a><span class="Delimiter">);</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Comment">// End Level-3 Transforms</span>
+<span id="L22" class="LineNr"> 22 </span>
+<span id="L23" class="LineNr"> 23 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L24" class="LineNr"> 24 </span><span class="Normal">int</span> <a href='038---literal_strings.cc.html#L24'>Next_auto_global</a> = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L25" class="LineNr"> 25 </span><span class="Delimiter">:(code)</span>
+<span id="L26" class="LineNr"> 26 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L26'>transform_literal_strings</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L27" class="LineNr"> 27 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- move literal strings to <a href='011run.cc.html#L125'>data</a> segment&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </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="L29" class="LineNr"> 29 </span>  segment&amp; <a href='031check_operands.cc.html#L14'>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="L30" class="LineNr"> 30 </span>  segment <a href='011run.cc.html#L125'>data</a><span class="Delimiter">;</span>
+<span id="L31" class="LineNr"> 31 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L32" class="LineNr"> 32 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>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 = <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="L34" class="LineNr"> 34 </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="L35" class="LineNr"> 35 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><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="L36" class="LineNr"> 36 </span>      ostringstream global_name<span class="Delimiter">;</span>
+<span id="L37" class="LineNr"> 37 </span>      global_name &lt;&lt; <span class="Constant">&quot;__subx_global_&quot;</span> &lt;&lt; <a href='038---literal_strings.cc.html#L24'>Next_auto_global</a><span class="Delimiter">;</span>
+<span id="L38" class="LineNr"> 38 </span>      ++Next_auto_global<span class="Delimiter">;</span>
+<span id="L39" class="LineNr"> 39 </span>      <a href='038---literal_strings.cc.html#L53'>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> <a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L40" class="LineNr"> 40 </span>      curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> = global_name<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L41" class="LineNr"> 41 </span>    <span class="Delimiter">}</span>
+<span id="L42" class="LineNr"> 42 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L209'>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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L43" class="LineNr"> 43 </span>  <span class="Delimiter">}</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011run.cc.html#L125'>data</a><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="L45" class="LineNr"> 45 </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="L46" class="LineNr"> 46 </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="L47" class="LineNr"> 47 </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><a href='011run.cc.html#L125'>data</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="Delimiter">}</span>
+<span id="L49" class="LineNr"> 49 </span>  vector&lt;line&gt;&amp; existing_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="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">;</span>
+<span id="L50" class="LineNr"> 50 </span>  existing_data<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>existing_data<span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">(),</span> <a href='011run.cc.html#L125'>data</a><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#L125'>data</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">());</span>
+<span id="L51" class="LineNr"> 51 </span><span class="Delimiter">}</span>
+<span id="L52" class="LineNr"> 52 </span>
+<span id="L53" class="LineNr"> 53 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L53'>add_global_to_data_segment</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; <a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; value<span class="Delimiter">,</span> segment&amp; <a href='011run.cc.html#L125'>data</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L54" class="LineNr"> 54 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;adding global variable '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' containing &quot;</span> &lt;&lt; value<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="Comment">// emit label</span>
+<span id="L56" class="LineNr"> 56 </span>  <a href='011run.cc.html#L125'>data</a><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><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">));</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="Comment">// emit size for size-prefixed array</span>
+<span id="L58" class="LineNr"> 58 </span>  <a href='011run.cc.html#L125'>data</a><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="L59" class="LineNr"> 59 </span>  emit_hex_bytes<span class="Delimiter">(</span><a href='011run.cc.html#L125'>data</a><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><a href='011run.cc.html#L125'>data</a><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="L60" class="LineNr"> 60 </span>  <span class="Comment">// emit data byte by byte</span>
+<span id="L61" class="LineNr"> 61 </span>  <a href='011run.cc.html#L125'>data</a><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="L62" class="LineNr"> 62 </span>  line&amp; curr = <a href='011run.cc.html#L125'>data</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>back<span class="Delimiter">();</span>
+<span id="L63" class="LineNr"> 63 </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='011run.cc.html#L108'>start</a> 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><a href='011run.cc.html#L125'>data</a><span class="Delimiter">)</span>-<span class="Comment">/*</span><span class="Comment">skip <a href='003trace.cc.html#L222'>end</a> 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="L64" class="LineNr"> 64 </span>    <span class="Normal">char</span> c = value<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span>
+<span id="L66" class="LineNr"> 66 </span>    curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L125'>data</a> = <a href='030---operands.cc.html#L274'>hex_byte_to_string</a><span class="Delimiter">(</span>c<span class="Delimiter">);</span>
+<span id="L67" class="LineNr"> 67 </span>    curr<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>string<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">,</span> c<span class="Delimiter">));</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Delimiter">}</span>
+<span id="L69" class="LineNr"> 69 </span><span class="Delimiter">}</span>
+<span id="L70" class="LineNr"> 70 </span>
+<span id="L71" class="LineNr"> 71 </span><a href='011run.cc.html#L117'>line</a> label<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L72" class="LineNr"> 72 </span>  <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span>
+<span id="L73" class="LineNr"> 73 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span>
+<span id="L74" class="LineNr"> 74 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L125'>data</a> = <span class="Delimiter">(</span>s+<span class="Constant">&quot;:&quot;</span><span class="Delimiter">);</span>
+<span id="L75" class="LineNr"> 75 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L76" class="LineNr"> 76 </span><span class="Delimiter">}</span>
+<span id="L77" class="LineNr"> 77 </span>
+<span id="L78" class="LineNr"> 78 </span><span class="Comment">//: Within strings, whitespace is significant. So we need to redo our instruction</span>
+<span id="L79" class="LineNr"> 79 </span><span class="Comment">//: parsing.</span>
+<span id="L80" class="LineNr"> 80 </span>
+<span id="L81" class="LineNr"> 81 </span><span class="Delimiter">:(scenarios parse_instruction_character_by_character)</span>
+<span id="L82" class="LineNr"> 82 </span><span class="Delimiter">:(scenario instruction_with_string_literal)</span>
+<span id="L83" class="LineNr"> 83 </span>a <span class="Constant">&quot;abc  def&quot;</span> z  <span class="Comment"># two spaces inside string</span>
+<span id="L84" class="LineNr"> 84 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
+<span id="L85" class="LineNr"> 85 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: &quot;abc  def&quot;</span>
+<span id="L86" class="LineNr"> 86 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: z</span>
+<span id="L87" class="LineNr"> 87 </span><span class="Comment"># no other words</span>
+<span id="L88" class="LineNr"> 88 </span>$parse2: <span class="Constant">3</span>
+<span id="L89" class="LineNr"> 89 </span>
+<span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(before &quot;End Line Parsing Special-cases(line_data -&gt; l)&quot;)</span>
+<span id="L91" class="LineNr"> 91 </span><span class="Normal">if</span> <span class="Delimiter">(</span>line_data<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">'&quot;'</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// can cause false-positives, but we can handle them</span>
+<span id="L92" class="LineNr"> 92 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>line_data<span class="Delimiter">,</span> l<span class="Delimiter">);</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Identifier">continue</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="Delimiter">:(code)</span>
+<span id="L97" class="LineNr"> 97 </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="L98" class="LineNr"> 98 </span>  <span class="Comment">// parse literals</span>
+<span id="L99" class="LineNr"> 99 </span>  istringstream in<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span>
+<span id="L100" class="LineNr">100 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
+<span id="L101" class="LineNr">101 </span>  <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Comment">// add tokens (words or strings) one by one</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L104" class="LineNr">104 </span>    <a href='038---literal_strings.cc.html#L137'>skip_whitespace</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L105" class="LineNr">105 </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="L106" class="LineNr">106 </span>    <span class="Normal">char</span> c = in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L107" class="LineNr">107 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// comment; drop rest of line</span>
+<span id="L108" class="LineNr">108 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// line metadata; skip for now</span>
+<span id="L109" class="LineNr">109 </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="L110" class="LineNr">110 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// comment token at end of line</span>
+<span id="L111" class="LineNr">111 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span>
+<span id="L112" class="LineNr">112 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// '.' followed by space is comment token; skip</span>
+<span id="L113" class="LineNr">113 </span>    <span class="Delimiter">}</span>
+<span id="L114" class="LineNr">114 </span>    ostringstream w<span class="Delimiter">;</span>
+<span id="L115" class="LineNr">115 </span>    w &lt;&lt; c<span class="Delimiter">;</span>
+<span id="L116" class="LineNr">116 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'&quot;'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L117" class="LineNr">117 </span>      <span class="Comment">// slurp until '&quot;'</span>
+<span id="L118" class="LineNr">118 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L119" class="LineNr">119 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
+<span id="L120" class="LineNr">120 </span>        w &lt;&lt; c<span class="Delimiter">;</span>
+<span id="L121" class="LineNr">121 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'&quot;'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L122" class="LineNr">122 </span>      <span class="Delimiter">}</span>
+<span id="L123" class="LineNr">123 </span>    <span class="Delimiter">}</span>
+<span id="L124" class="LineNr">124 </span>    <span class="Comment">// slurp any remaining characters until whitespace</span>
+<span id="L125" class="LineNr">125 </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#L260'>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="L126" class="LineNr">126 </span>      in &gt;&gt; c<span class="Delimiter">;</span>
+<span id="L127" class="LineNr">127 </span>      w &lt;&lt; c<span class="Delimiter">;</span>
+<span id="L128" class="LineNr">128 </span>    <span class="Delimiter">}</span>
+<span id="L129" class="LineNr">129 </span>    result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span>
+<span id="L130" class="LineNr">130 </span>    <a href='011run.cc.html#L184'>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="L131" class="LineNr">131 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L132" class="LineNr">132 </span>  <span class="Delimiter">}</span>
+<span id="L133" class="LineNr">133 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
+<span id="L134" class="LineNr">134 </span>    out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>result<span class="Delimiter">);</span>
+<span id="L135" class="LineNr">135 </span><span class="Delimiter">}</span>
+<span id="L136" class="LineNr">136 </span>
+<span id="L137" class="LineNr">137 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L137'>skip_whitespace</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L138" class="LineNr">138 </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="L139" class="LineNr">139 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>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="L140" class="LineNr">140 </span>    <span class="Normal">else</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L141" class="LineNr">141 </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><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L144'>skip_comment</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L145" class="LineNr">145 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>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="L146" class="LineNr">146 </span>    in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L147" class="LineNr">147 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>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="L148" class="LineNr">148 </span>  <span class="Delimiter">}</span>
+<span id="L149" class="LineNr">149 </span><span class="Delimiter">}</span>
+<span id="L150" class="LineNr">150 </span>
+<span id="L151" class="LineNr">151 </span><span class="Comment">// helper for tests</span>
+<span id="L152" class="LineNr">152 </span><span class="Normal">void</span> parse_instruction_character_by_character<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; line_data<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L153" class="LineNr">153 </span>  vector&lt;line&gt; out<span class="Delimiter">;</span>
+<span id="L154" class="LineNr">154 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>line_data<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L155" class="LineNr">155 </span><span class="Delimiter">}</span>
+<span id="L156" class="LineNr">156 </span>
+<span id="L157" class="LineNr">157 </span><span class="Delimiter">:(scenario parse2_comment_token_in_middle)</span>
+<span id="L158" class="LineNr">158 </span>a <span class="Delimiter">.</span> z
+<span id="L159" class="LineNr">159 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
+<span id="L160" class="LineNr">160 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: z</span>
+<span id="L161" class="LineNr">161 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L123'>word</a>: .</span>
+<span id="L162" class="LineNr">162 </span><span class="Comment"># no other words</span>
+<span id="L163" class="LineNr">163 </span>$parse2: <span class="Constant">2</span>
+<span id="L164" class="LineNr">164 </span>
+<span id="L165" class="LineNr">165 </span><span class="Delimiter">:(scenario parse2_word_starting_with_dot)</span>
+<span id="L166" class="LineNr">166 </span>a <span class="Delimiter">.</span>b c
+<span id="L167" class="LineNr">167 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
+<span id="L168" class="LineNr">168 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: .b</span>
+<span id="L169" class="LineNr">169 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: c</span>
+<span id="L170" class="LineNr">170 </span>
+<span id="L171" class="LineNr">171 </span><span class="Delimiter">:(scenario parse2_comment_token_at_start)</span>
+<span id="L172" class="LineNr">172 </span><span class="Delimiter">.</span> a b
+<span id="L173" class="LineNr">173 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
+<span id="L174" class="LineNr">174 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b</span>
+<span id="L175" class="LineNr">175 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L123'>word</a>: .</span>
+<span id="L176" class="LineNr">176 </span>
+<span id="L177" class="LineNr">177 </span><span class="Delimiter">:(scenario parse2_comment_token_at_end)</span>
+<span id="L178" class="LineNr">178 </span>a b <span class="Delimiter">.</span>
+<span id="L179" class="LineNr">179 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
+<span id="L180" class="LineNr">180 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b</span>
+<span id="L181" class="LineNr">181 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L123'>word</a>: .</span>
+<span id="L182" class="LineNr">182 </span>
+<span id="L183" class="LineNr">183 </span><span class="Delimiter">:(scenario parse2_word_starting_with_dot_at_start)</span>
+<span id="L184" class="LineNr">184 </span><span class="Delimiter">.</span>a b c
+<span id="L185" class="LineNr">185 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: .a</span>
+<span id="L186" class="LineNr">186 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b</span>
+<span id="L187" class="LineNr">187 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: c</span>
+<span id="L188" class="LineNr">188 </span>
+<span id="L189" class="LineNr">189 </span><span class="Delimiter">:(scenario parse2_metadata)</span>
+<span id="L190" class="LineNr">190 </span><span class="Delimiter">.</span>a b/c d
+<span id="L191" class="LineNr">191 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: .a</span>
+<span id="L192" class="LineNr">192 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b /c</span>
+<span id="L193" class="LineNr">193 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: d</span>
+<span id="L194" class="LineNr">194 </span>
+<span id="L195" class="LineNr">195 </span><span class="Delimiter">:(scenario parse2_string_with_metadata)</span>
+<span id="L196" class="LineNr">196 </span>a <span class="Constant">&quot;bc  def&quot;</span>/disp32 g
+<span id="L197" class="LineNr">197 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
+<span id="L198" class="LineNr">198 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: &quot;bc  def&quot; /disp32</span>
+<span id="L199" class="LineNr">199 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: g</span>
+<span id="L200" class="LineNr">200 </span>
+<span id="L201" class="LineNr">201 </span><span class="Delimiter">:(scenario parse2_string_with_metadata_at_end)</span>
+<span id="L202" class="LineNr">202 </span>a <span class="Constant">&quot;bc  def&quot;</span>/disp32
+<span id="L203" class="LineNr">203 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
+<span id="L204" class="LineNr">204 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: &quot;bc  def&quot; /disp32</span>
+<span id="L205" class="LineNr">205 </span>
+<span id="L206" class="LineNr">206 </span><span class="Delimiter">:(code)</span>
+<span id="L207" class="LineNr">207 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L207'>test_parse2_string_with_metadata_at_end_of_line_without_newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L208" class="LineNr">208 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
+<span id="L209" class="LineNr">209 </span>      <span class="Constant">&quot;68/push </span><span class="cSpecial">\&quot;</span><span class="Constant">test</span><span class="cSpecial">\&quot;</span><span class="Constant">/f&quot;</span>  <span class="Comment">// no newline, which is how calls from parse() will look</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Delimiter">);</span>
+<span id="L211" class="LineNr">211 </span>  <a href='003trace.cc.html#L250'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L212" class="LineNr">212 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L123'>word</a>: 68 /push^D&quot;</span>
+<span id="L213" class="LineNr">213 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L123'>word</a>: </span><span class="cSpecial">\&quot;</span><span class="Constant">test</span><span class="cSpecial">\&quot;</span><span class="Constant"> /f^D&quot;</span>
+<span id="L214" class="LineNr">214 </span>  <span class="Delimiter">);</span>
+<span id="L215" class="LineNr">215 </span><span class="Delimiter">}</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/040---tests.cc.html b/html/subx/040---tests.cc.html
index 7a676bb1..8d17c343 100644
--- a/html/subx/040---tests.cc.html
+++ b/html/subx/040---tests.cc.html
@@ -60,110 +60,92 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="Comment">//: Beginning of level 3: support for automatically aggregating functions into</span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment">//: test suites.</span>
-<span id="L3" class="LineNr">  3 </span><span class="Comment">//:</span>
-<span id="L4" class="LineNr">  4 </span><span class="Comment">//: (As explained in the transform layer, level 3 runs before level 2. We</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment">//: can't use any of the transforms in previous layers. But we *do* rely on</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment">//: those concepts being present in the input. Particularly labels.)</span>
-<span id="L7" class="LineNr">  7 </span>
-<span id="L8" class="LineNr">  8 </span><span class="Delimiter">:(after &quot;Begin Transforms&quot;)</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment">// Begin Level-3 Transforms</span>
-<span id="L10" class="LineNr"> 10 </span><a href='011run.cc.html#L194'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>create_test_function<span class="Delimiter">);</span>
-<span id="L11" class="LineNr"> 11 </span><span class="Comment">// End Level-3 Transforms</span>
-<span id="L12" class="LineNr"> 12 </span>
-<span id="L13" class="LineNr"> 13 </span><span class="Delimiter">:(scenario run_test)</span>
-<span id="L14" class="LineNr"> 14 </span><span class="Special">% Reg[ESP].u = 0x100;</span>
-<span id="L15" class="LineNr"> 15 </span>== <span class="Constant">0x1</span>
-<span id="L16" class="LineNr"> 16 </span><span class="Normal">main</span>:
-<span id="L17" class="LineNr"> 17 </span>  e8/call run_tests/disp32  <span class="Comment"># 5 bytes</span>
-<span id="L18" class="LineNr"> 18 </span>  f4/halt                   <span class="Comment"># 1 byte</span>
-<span id="L19" class="LineNr"> 19 </span>
-<span id="L20" class="LineNr"> 20 </span><span class="Normal">test_foo</span>:  <span class="Comment"># offset 7</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="PreProc">0</span><span class="Constant">1</span> d8  <span class="Comment"># just some unique instruction: add EBX to EAX</span>
-<span id="L22" class="LineNr"> 22 </span>  c3/<span class="Identifier">return</span>
-<span id="L23" class="LineNr"> 23 </span>
-<span id="L24" class="LineNr"> 24 </span><span class="Comment"># check that code in test_foo ran (implicitly called by run_tests)</span>
-<span id="L25" class="LineNr"> 25 </span><span class="traceContains">+run: inst: 0x00000007</span>
-<span id="L26" class="LineNr"> 26 </span>
-<span id="L27" class="LineNr"> 27 </span><span class="Delimiter">:(code)</span>
-<span id="L28" class="LineNr"> 28 </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="L29" class="LineNr"> 29 </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="L30" class="LineNr"> 30 </span>  segment&amp; <a href='031check_operands.cc.html#L14'>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="L31" class="LineNr"> 31 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- create 'run_tests'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L32" class="LineNr"> 32 </span>  vector&lt;line&gt; <a href='040---tests.cc.html#L32'>new_insts</a><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> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L34" class="LineNr"> 34 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>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="L35" class="LineNr"> 35 </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="L36" class="LineNr"> 36 </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="L37" class="LineNr"> 37 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><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="L38" class="LineNr"> 38 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!starts_with<span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">,</span> <span class="Constant">&quot;test_&quot;</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L39" class="LineNr"> 39 </span>      string fn = <a href='035labels.cc.html#L156'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
-<span id="L40" class="LineNr"> 40 </span>      <a href='040---tests.cc.html#L32'>new_insts</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>call<span class="Delimiter">(</span>fn<span class="Delimiter">));</span>
-<span id="L41" class="LineNr"> 41 </span>    <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><a href='040---tests.cc.html#L32'>new_insts</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// no tests found</span>
-<span id="L44" class="LineNr"> 44 </span>  <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">(</span><span class="Constant">&quot;run_tests&quot;</span><span class="Delimiter">));</span>
-<span id="L45" class="LineNr"> 45 </span>  <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">(),</span> <a href='040---tests.cc.html#L32'>new_insts</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> <a href='040---tests.cc.html#L32'>new_insts</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">());</span>
-<span id="L46" class="LineNr"> 46 </span>  <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>ret<span class="Delimiter">());</span>
-<span id="L47" class="LineNr"> 47 </span><span class="Delimiter">}</span>
-<span id="L48" class="LineNr"> 48 </span>
-<span id="L49" class="LineNr"> 49 </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="L50" class="LineNr"> 50 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L51" class="LineNr"> 51 </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="L52" class="LineNr"> 52 </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="L53" class="LineNr"> 53 </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="L54" class="LineNr"> 54 </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="L55" class="LineNr"> 55 </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="L56" class="LineNr"> 56 </span>    <span class="Delimiter">}</span>
-<span id="L57" class="LineNr"> 57 </span>    out &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L58" class="LineNr"> 58 </span>  <span class="Delimiter">}</span>
-<span id="L59" class="LineNr"> 59 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L60" class="LineNr"> 60 </span><span class="Delimiter">}</span>
-<span id="L61" class="LineNr"> 61 </span>
-<span id="L62" class="LineNr"> 62 </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="L63" class="LineNr"> 63 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L64" class="LineNr"> 64 </span>  out &lt;&lt; w<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">;</span>
-<span id="L65" class="LineNr"> 65 </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="L66" class="LineNr"> 66 </span>    out &lt;&lt; <span class="Constant">'/'</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="L67" class="LineNr"> 67 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L68" class="LineNr"> 68 </span><span class="Delimiter">}</span>
-<span id="L69" class="LineNr"> 69 </span>
-<span id="L70" class="LineNr"> 70 </span><a href='011run.cc.html#L117'>line</a> <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L71" class="LineNr"> 71 </span>  <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span>
-<span id="L72" class="LineNr"> 72 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span>
-<span id="L73" class="LineNr"> 73 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L125'>data</a> = <span class="Delimiter">(</span>s+<span class="Constant">&quot;:&quot;</span><span class="Delimiter">);</span>
-<span id="L74" class="LineNr"> 74 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L75" class="LineNr"> 75 </span><span class="Delimiter">}</span>
-<span id="L76" class="LineNr"> 76 </span>
-<span id="L77" class="LineNr"> 77 </span><a href='011run.cc.html#L117'>line</a> call<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L78" class="LineNr"> 78 </span>  <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span>
-<span id="L79" class="LineNr"> 79 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>call<span class="Delimiter">());</span>
-<span id="L80" class="LineNr"> 80 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>disp32<span class="Delimiter">(</span>s<span class="Delimiter">));</span>
-<span id="L81" class="LineNr"> 81 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L82" class="LineNr"> 82 </span><span class="Delimiter">}</span>
-<span id="L83" class="LineNr"> 83 </span>
-<span id="L84" class="LineNr"> 84 </span><a href='011run.cc.html#L123'>word</a> call<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L85" class="LineNr"> 85 </span>  <a href='011run.cc.html#L123'>word</a> result<span class="Delimiter">;</span>
-<span id="L86" class="LineNr"> 86 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> = <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">;</span>
-<span id="L87" class="LineNr"> 87 </span>  result<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;call&quot;</span><span class="Delimiter">);</span>
-<span id="L88" class="LineNr"> 88 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span>
-<span id="L90" class="LineNr"> 90 </span>
-<span id="L91" class="LineNr"> 91 </span><a href='011run.cc.html#L123'>word</a> disp32<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L92" class="LineNr"> 92 </span>  <a href='011run.cc.html#L123'>word</a> result<span class="Delimiter">;</span>
-<span id="L93" class="LineNr"> 93 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> = s<span class="Delimiter">;</span>
-<span id="L94" class="LineNr"> 94 </span>  result<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">);</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L96" class="LineNr"> 96 </span><span class="Delimiter">}</span>
-<span id="L97" class="LineNr"> 97 </span>
-<span id="L98" class="LineNr"> 98 </span><a href='011run.cc.html#L117'>line</a> ret<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L99" class="LineNr"> 99 </span>  <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span>
-<span id="L100" class="LineNr">100 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span>
-<span id="L101" class="LineNr">101 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L125'>data</a> = <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">;</span>
-<span id="L102" class="LineNr">102 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;return&quot;</span><span class="Delimiter">);</span>
-<span id="L103" class="LineNr">103 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L104" class="LineNr">104 </span><span class="Delimiter">}</span>
+<span id="L1" class="LineNr"> 1 </span><span class="Comment">//: Automatically aggregating functions into test suites.</span>
+<span id="L2" class="LineNr"> 2 </span>
+<span id="L3" class="LineNr"> 3 </span><span class="Comment">//: We don't rely on any transforms running in previous layers, but this layer</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Comment">//: knows about labels and will emit labels for previous layers to transform.</span>
+<span id="L5" class="LineNr"> 5 </span><span class="Delimiter">:(after &quot;Begin Transforms&quot;)</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Comment">// Begin Level-4 Transforms</span>
+<span id="L7" class="LineNr"> 7 </span><a href='011run.cc.html#L207'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>create_test_function<span class="Delimiter">);</span>
+<span id="L8" class="LineNr"> 8 </span><span class="Comment">// End Level-4 Transforms</span>
+<span id="L9" class="LineNr"> 9 </span>
+<span id="L10" class="LineNr">10 </span><span class="Delimiter">:(scenario run_test)</span>
+<span id="L11" class="LineNr">11 </span><span class="Special">% Reg[ESP].u = 0x100;</span>
+<span id="L12" class="LineNr">12 </span>== <span class="Constant">0x1</span>
+<span id="L13" class="LineNr">13 </span><span class="Normal"><a href='000organization.cc.html#L113'>main</a></span>:
+<span id="L14" class="LineNr">14 </span>  e8/call run_tests/disp32  <span class="Comment"># 5 bytes</span>
+<span id="L15" class="LineNr">15 </span>  f4/halt                   <span class="Comment"># 1 byte</span>
+<span id="L16" class="LineNr">16 </span>
+<span id="L17" class="LineNr">17 </span><span class="Normal">test_foo</span>:  <span class="Comment"># offset 7</span>
+<span id="L18" class="LineNr">18 </span>  <span class="PreProc">0</span><span class="Constant">1</span> d8  <span class="Comment"># just some unique instruction: add EBX to EAX</span>
+<span id="L19" class="LineNr">19 </span>  c3/<span class="Identifier">return</span>
+<span id="L20" class="LineNr">20 </span>
+<span id="L21" class="LineNr">21 </span><span class="Comment"># check that code in test_foo ran (implicitly called by run_tests)</span>
+<span id="L22" class="LineNr">22 </span><span class="traceContains">+run: inst: 0x00000007</span>
+<span id="L23" class="LineNr">23 </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> create_test_function<span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L26" class="LineNr">26 </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="L27" class="LineNr">27 </span>  segment&amp; <a href='031check_operands.cc.html#L14'>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="L28" class="LineNr">28 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- create 'run_tests'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L29" class="LineNr">29 </span>  vector&lt;line&gt; <a href='040---tests.cc.html#L29'>new_insts</a><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#L14'>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#L14'>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="L33" class="LineNr">33 </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="L34" class="LineNr">34 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><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="L35" class="LineNr">35 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!starts_with<span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">,</span> <span class="Constant">&quot;test_&quot;</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L36" class="LineNr">36 </span>      string fn = <a href='035labels.cc.html#L166'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a><span class="Delimiter">);</span>
+<span id="L37" class="LineNr">37 </span>      <a href='040---tests.cc.html#L29'>new_insts</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>call<span class="Delimiter">(</span>fn<span class="Delimiter">));</span>
+<span id="L38" class="LineNr">38 </span>    <span class="Delimiter">}</span>
+<span id="L39" class="LineNr">39 </span>  <span class="Delimiter">}</span>
+<span id="L40" class="LineNr">40 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='040---tests.cc.html#L29'>new_insts</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// no tests found</span>
+<span id="L41" class="LineNr">41 </span>  <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>label<span class="Delimiter">(</span><span class="Constant">&quot;run_tests&quot;</span><span class="Delimiter">));</span>
+<span id="L42" class="LineNr">42 </span>  <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">(),</span> <a href='040---tests.cc.html#L29'>new_insts</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> <a href='040---tests.cc.html#L29'>new_insts</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">());</span>
+<span id="L43" class="LineNr">43 </span>  <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>ret<span class="Delimiter">());</span>
+<span id="L44" class="LineNr">44 </span><span class="Delimiter">}</span>
+<span id="L45" class="LineNr">45 </span>
+<span id="L46" class="LineNr">46 </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="L47" class="LineNr">47 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L48" class="LineNr">48 </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="L49" class="LineNr">49 </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="L50" class="LineNr">50 </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="L51" class="LineNr">51 </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="L52" class="LineNr">52 </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="L53" class="LineNr">53 </span>    <span class="Delimiter">}</span>
+<span id="L54" class="LineNr">54 </span>    out &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L55" class="LineNr">55 </span>  <span class="Delimiter">}</span>
+<span id="L56" class="LineNr">56 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L57" class="LineNr">57 </span><span class="Delimiter">}</span>
+<span id="L58" class="LineNr">58 </span>
+<span id="L59" class="LineNr">59 </span><a href='011run.cc.html#L117'>line</a> call<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L60" class="LineNr">60 </span>  <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span>
+<span id="L61" class="LineNr">61 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>call<span class="Delimiter">());</span>
+<span id="L62" class="LineNr">62 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>disp32<span class="Delimiter">(</span>s<span class="Delimiter">));</span>
+<span id="L63" class="LineNr">63 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L64" class="LineNr">64 </span><span class="Delimiter">}</span>
+<span id="L65" class="LineNr">65 </span>
+<span id="L66" class="LineNr">66 </span><a href='011run.cc.html#L123'>word</a> call<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L67" class="LineNr">67 </span>  <a href='011run.cc.html#L123'>word</a> result<span class="Delimiter">;</span>
+<span id="L68" class="LineNr">68 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> = <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">;</span>
+<span id="L69" class="LineNr">69 </span>  result<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;call&quot;</span><span class="Delimiter">);</span>
+<span id="L70" class="LineNr">70 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L71" class="LineNr">71 </span><span class="Delimiter">}</span>
+<span id="L72" class="LineNr">72 </span>
+<span id="L73" class="LineNr">73 </span><a href='011run.cc.html#L123'>word</a> disp32<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L74" class="LineNr">74 </span>  <a href='011run.cc.html#L123'>word</a> result<span class="Delimiter">;</span>
+<span id="L75" class="LineNr">75 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L125'>data</a> = s<span class="Delimiter">;</span>
+<span id="L76" class="LineNr">76 </span>  result<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">);</span>
+<span id="L77" class="LineNr">77 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L78" class="LineNr">78 </span><span class="Delimiter">}</span>
+<span id="L79" class="LineNr">79 </span>
+<span id="L80" class="LineNr">80 </span><a href='011run.cc.html#L117'>line</a> ret<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L81" class="LineNr">81 </span>  <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span>
+<span id="L82" class="LineNr">82 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span>
+<span id="L83" class="LineNr">83 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L125'>data</a> = <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">;</span>
+<span id="L84" class="LineNr">84 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;return&quot;</span><span class="Delimiter">);</span>
+<span id="L85" class="LineNr">85 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L86" class="LineNr">86 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/apps/crenshaw2-1.subx.html b/html/subx/apps/crenshaw2-1.subx.html
index 73e18f96..c01985bb 100644
--- a/html/subx/apps/crenshaw2-1.subx.html
+++ b/html/subx/apps/crenshaw2-1.subx.html
@@ -6,17 +6,18 @@
 <meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
-<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
 <meta name="colorscheme" content="minimal">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .LineNr { color: #444444; }
 .Delimiter { color: #800080; }
+.Folded { color: #a8a8a8; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .SalientComment { color: #00ffff; }
@@ -75,9 +76,9 @@ if ('onhashchange' in window) {
 <span id="L19" class="LineNr"> 19 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L20" class="LineNr"> 20 </span>
 <span id="L21" class="LineNr"> 21 </span><span class="Comment"># main:</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Comment"># abort(Error_integer)</span>
+<span id="L22" class="LineNr"> 22 </span>  <span class="Comment"># abort(&quot;Integer&quot;)</span>
 <span id="L23" class="LineNr"> 23 </span>    <span class="Comment"># push args</span>
-<span id="L24" class="LineNr"> 24 </span>  68/push  Error_integer/imm32
+<span id="L24" class="LineNr"> 24 </span>  68/push  &quot;Integer&quot;/imm32
 <span id="L25" class="LineNr"> 25 </span>    <span class="Comment"># call</span>
 <span id="L26" class="LineNr"> 26 </span>  e8/call  abort/disp32
 <span id="L27" class="LineNr"> 27 </span>    <span class="Comment"># discard arg</span>
@@ -87,107 +88,168 @@ if ('onhashchange' in window) {
 <span id="L31" class="LineNr"> 31 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit      <span class="Comment"># copy 1 to EAX</span>
 <span id="L32" class="LineNr"> 32 </span>  cd/syscall  0x80/imm8
 <span id="L33" class="LineNr"> 33 </span>
-<span id="L34" class="LineNr"> 34 </span><span class="Comment"># print error message and exit</span>
-<span id="L35" class="LineNr"> 35 </span><span class="Comment"># really maps to the 'Expected' function in Crenshaw</span>
-<span id="L36" class="LineNr"> 36 </span>abort:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L37" class="LineNr"> 37 </span>  <span class="Comment"># error(s)</span>
-<span id="L38" class="LineNr"> 38 </span>    <span class="Comment"># push args</span>
-<span id="L39" class="LineNr"> 39 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(ESP+4)</span>
-<span id="L40" class="LineNr"> 40 </span>    <span class="Comment"># call</span>
-<span id="L41" class="LineNr"> 41 </span>  e8/call  error/disp32
-<span id="L42" class="LineNr"> 42 </span>    <span class="Comment"># discard arg</span>
-<span id="L43" class="LineNr"> 43 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Comment"># exit(1)</span>
-<span id="L45" class="LineNr"> 45 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EBX</span>
-<span id="L46" class="LineNr"> 46 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit      <span class="Comment"># copy 1 to EAX</span>
-<span id="L47" class="LineNr"> 47 </span>  cd/syscall  0x80/imm8
-<span id="L48" class="LineNr"> 48 </span>
-<span id="L49" class="LineNr"> 49 </span><span class="Comment"># print out &quot;Error: #{s} expected\n&quot; to stderr</span>
-<span id="L50" class="LineNr"> 50 </span>error:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L51" class="LineNr"> 51 </span>  <span class="Comment"># write_stderr(&quot;Error: &quot;)</span>
-<span id="L52" class="LineNr"> 52 </span>    <span class="Comment"># push args</span>
-<span id="L53" class="LineNr"> 53 </span>  68/push  Error/imm32
-<span id="L54" class="LineNr"> 54 </span>    <span class="Comment"># call</span>
-<span id="L55" class="LineNr"> 55 </span>  e8/call  write_stderr/disp32
-<span id="L56" class="LineNr"> 56 </span>    <span class="Comment"># discard arg</span>
-<span id="L57" class="LineNr"> 57 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
-<span id="L58" class="LineNr"> 58 </span>  <span class="Comment"># write_stderr(s)</span>
-<span id="L59" class="LineNr"> 59 </span>    <span class="Comment"># push args</span>
-<span id="L60" class="LineNr"> 60 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(ESP+4)</span>
-<span id="L61" class="LineNr"> 61 </span>    <span class="Comment"># call</span>
-<span id="L62" class="LineNr"> 62 </span>  e8/call  write_stderr/disp32
-<span id="L63" class="LineNr"> 63 </span>    <span class="Comment"># discard arg</span>
-<span id="L64" class="LineNr"> 64 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
-<span id="L65" class="LineNr"> 65 </span>  <span class="Comment"># write_stderr(&quot; expected&quot;)</span>
-<span id="L66" class="LineNr"> 66 </span>    <span class="Comment"># push args</span>
-<span id="L67" class="LineNr"> 67 </span>  68/push  Expected_suffix/imm32
-<span id="L68" class="LineNr"> 68 </span>    <span class="Comment"># call</span>
-<span id="L69" class="LineNr"> 69 </span>  e8/call  write_stderr/disp32
-<span id="L70" class="LineNr"> 70 </span>    <span class="Comment"># discard arg</span>
-<span id="L71" class="LineNr"> 71 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
-<span id="L72" class="LineNr"> 72 </span>  <span class="Comment"># write_stderr(&quot;\n&quot;)</span>
-<span id="L73" class="LineNr"> 73 </span>    <span class="Comment"># push args</span>
-<span id="L74" class="LineNr"> 74 </span>  68/push  Newline/imm32
-<span id="L75" class="LineNr"> 75 </span>    <span class="Comment"># call</span>
-<span id="L76" class="LineNr"> 76 </span>  e8/call  write_stderr/disp32
-<span id="L77" class="LineNr"> 77 </span>    <span class="Comment"># discard arg</span>
-<span id="L78" class="LineNr"> 78 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
-<span id="L79" class="LineNr"> 79 </span>  <span class="Comment"># end</span>
-<span id="L80" class="LineNr"> 80 </span>  c3/return
-<span id="L81" class="LineNr"> 81 </span>
-<span id="L82" class="LineNr"> 82 </span>write_stderr:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Comment"># write(2/stderr, (data) s+4, (size) *s)</span>
-<span id="L84" class="LineNr"> 84 </span>    <span class="Comment"># fd = 2 (stderr)</span>
-<span id="L85" class="LineNr"> 85 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              2/imm32           <span class="Comment"># copy 2 to EBX</span>
-<span id="L86" class="LineNr"> 86 </span>    <span class="Comment"># x = s+4</span>
-<span id="L87" class="LineNr"> 87 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to ECX</span>
-<span id="L88" class="LineNr"> 88 </span>  81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ECX</span>
-<span id="L89" class="LineNr"> 89 </span>    <span class="Comment"># size = *s</span>
-<span id="L90" class="LineNr"> 90 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EDX</span>
-<span id="L91" class="LineNr"> 91 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
-<span id="L92" class="LineNr"> 92 </span>    <span class="Comment"># call write()</span>
-<span id="L93" class="LineNr"> 93 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write     <span class="Comment"># copy 1 to EAX</span>
-<span id="L94" class="LineNr"> 94 </span>  cd/syscall  0x80/imm8
-<span id="L95" class="LineNr"> 95 </span>  <span class="Comment"># end</span>
-<span id="L96" class="LineNr"> 96 </span>  c3/return
-<span id="L97" class="LineNr"> 97 </span>
-<span id="L98" class="LineNr"> 98 </span>write_stdout:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L99" class="LineNr"> 99 </span>  <span class="Comment"># write(1/stdout, (data) s+4, (size) *s)</span>
-<span id="L100" class="LineNr">100 </span>    <span class="Comment"># fd = 1 (stdout)</span>
-<span id="L101" class="LineNr">101 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EBX</span>
-<span id="L102" class="LineNr">102 </span>    <span class="Comment"># x = s+4</span>
-<span id="L103" class="LineNr">103 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to ECX</span>
-<span id="L104" class="LineNr">104 </span>  81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ECX</span>
-<span id="L105" class="LineNr">105 </span>    <span class="Comment"># size = *s</span>
-<span id="L106" class="LineNr">106 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EDX</span>
-<span id="L107" class="LineNr">107 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
-<span id="L108" class="LineNr">108 </span>    <span class="Comment"># call write()</span>
-<span id="L109" class="LineNr">109 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write     <span class="Comment"># copy 1 to EAX</span>
-<span id="L110" class="LineNr">110 </span>  cd/syscall  0x80/imm8
-<span id="L111" class="LineNr">111 </span>  <span class="Comment"># end</span>
-<span id="L112" class="LineNr">112 </span>  c3/return
-<span id="L113" class="LineNr">113 </span>
-<span id="L114" class="LineNr">114 </span>== data
-<span id="L115" class="LineNr">115 </span>Newline:
-<span id="L116" class="LineNr">116 </span>  <span class="Comment"># size</span>
-<span id="L117" class="LineNr">117 </span>  01 00 00 00
-<span id="L118" class="LineNr">118 </span>  <span class="Comment"># data</span>
-<span id="L119" class="LineNr">119 </span>  0a/newline
-<span id="L120" class="LineNr">120 </span>Error:  <span class="Comment"># &quot;Error: &quot; : (array byte)</span>
-<span id="L121" class="LineNr">121 </span>  <span class="Comment"># size</span>
-<span id="L122" class="LineNr">122 </span>  07 00 00 00
-<span id="L123" class="LineNr">123 </span>  <span class="Comment"># data</span>
-<span id="L124" class="LineNr">124 </span>  45/E 72/r 72/r 6f/o 72/r 3a/: 20/space
-<span id="L125" class="LineNr">125 </span>Expected_suffix:  <span class="Comment"># &quot; expected&quot; : (array byte)</span>
-<span id="L126" class="LineNr">126 </span>  <span class="Comment"># size</span>
-<span id="L127" class="LineNr">127 </span>  09 00 00 00
-<span id="L128" class="LineNr">128 </span>  <span class="Comment"># data</span>
-<span id="L129" class="LineNr">129 </span>  20/space 65/e 78/x 70/p 65/e 63/c 74/t 65/e 64/d
-<span id="L130" class="LineNr">130 </span>Error_integer:  <span class="Comment"># &quot;Integer&quot; : (array byte)</span>
-<span id="L131" class="LineNr">131 </span>  <span class="Comment"># size</span>
-<span id="L132" class="LineNr">132 </span>  07 00 00 00
-<span id="L133" class="LineNr">133 </span>  <span class="Comment"># data</span>
-<span id="L134" class="LineNr">134 </span>  49/I 6e/n 74/t 65/e 67/g 65/e 72/r
+<span id="L34" class="LineNr"> 34 </span><span class="SalientComment">## compiler helpers</span>
+<span id="L35" class="LineNr"> 35 </span>
+<span id="L36" class="LineNr"> 36 </span><span class="Comment"># print error message and exit</span>
+<span id="L37" class="LineNr"> 37 </span><span class="Comment"># really maps to the 'Expected' function in Crenshaw</span>
+<span id="L38" class="LineNr"> 38 </span>abort:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L39" class="LineNr"> 39 </span>  <span class="Comment"># error(s)</span>
+<span id="L40" class="LineNr"> 40 </span>    <span class="Comment"># push args</span>
+<span id="L41" class="LineNr"> 41 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(ESP+4)</span>
+<span id="L42" class="LineNr"> 42 </span>    <span class="Comment"># call</span>
+<span id="L43" class="LineNr"> 43 </span>  e8/call  error/disp32
+<span id="L44" class="LineNr"> 44 </span>    <span class="Comment"># discard arg</span>
+<span id="L45" class="LineNr"> 45 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L46" class="LineNr"> 46 </span>  <span class="Comment"># exit(1)</span>
+<span id="L47" class="LineNr"> 47 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EBX</span>
+<span id="L48" class="LineNr"> 48 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit      <span class="Comment"># copy 1 to EAX</span>
+<span id="L49" class="LineNr"> 49 </span>  cd/syscall  0x80/imm8
+<span id="L50" class="LineNr"> 50 </span>
+<span id="L51" class="LineNr"> 51 </span><span class="Comment"># print out &quot;Error: #{s} expected\n&quot; to stderr</span>
+<span id="L52" class="LineNr"> 52 </span>error:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L53" class="LineNr"> 53 </span>  <span class="Comment"># write_stderr(&quot;Error: &quot;)</span>
+<span id="L54" class="LineNr"> 54 </span>    <span class="Comment"># push args</span>
+<span id="L55" class="LineNr"> 55 </span>  68/push  &quot;Error: &quot;/imm32
+<span id="L56" class="LineNr"> 56 </span>    <span class="Comment"># call</span>
+<span id="L57" class="LineNr"> 57 </span>  e8/call  write_stderr/disp32
+<span id="L58" class="LineNr"> 58 </span>    <span class="Comment"># discard arg</span>
+<span id="L59" class="LineNr"> 59 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L60" class="LineNr"> 60 </span>  <span class="Comment"># write_stderr(s)</span>
+<span id="L61" class="LineNr"> 61 </span>    <span class="Comment"># push args</span>
+<span id="L62" class="LineNr"> 62 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(ESP+4)</span>
+<span id="L63" class="LineNr"> 63 </span>    <span class="Comment"># call</span>
+<span id="L64" class="LineNr"> 64 </span>  e8/call  write_stderr/disp32
+<span id="L65" class="LineNr"> 65 </span>    <span class="Comment"># discard arg</span>
+<span id="L66" class="LineNr"> 66 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L67" class="LineNr"> 67 </span>  <span class="Comment"># write_stderr(&quot; expected&quot;)</span>
+<span id="L68" class="LineNr"> 68 </span>    <span class="Comment"># push args</span>
+<span id="L69" class="LineNr"> 69 </span>  68/push  &quot; expected&quot;/imm32
+<span id="L70" class="LineNr"> 70 </span>    <span class="Comment"># call</span>
+<span id="L71" class="LineNr"> 71 </span>  e8/call  write_stderr/disp32
+<span id="L72" class="LineNr"> 72 </span>    <span class="Comment"># discard arg</span>
+<span id="L73" class="LineNr"> 73 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="Comment"># write_stderr(&quot;\n&quot;)</span>
+<span id="L75" class="LineNr"> 75 </span>    <span class="Comment"># push args</span>
+<span id="L76" class="LineNr"> 76 </span>  68/push  Newline/imm32
+<span id="L77" class="LineNr"> 77 </span>    <span class="Comment"># call</span>
+<span id="L78" class="LineNr"> 78 </span>  e8/call  write_stderr/disp32
+<span id="L79" class="LineNr"> 79 </span>    <span class="Comment"># discard arg</span>
+<span id="L80" class="LineNr"> 80 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Comment"># end</span>
+<span id="L82" class="LineNr"> 82 </span>  c3/return
+<span id="L83" class="LineNr"> 83 </span>
+<span id="L84" class="LineNr"> 84 </span><span class="SalientComment">## helpers</span>
+<span id="L85" class="LineNr"> 85 </span>
+<span id="L86" class="LineNr"> 86 </span><span class="Comment"># print msg to stderr if a != b, otherwise print &quot;.&quot;</span>
+<span id="L87" class="LineNr"> 87 </span>check_ints_equal:  <span class="Comment"># (a : int, b : int, msg : (address array byte)) -&gt; boolean</span>
+<span id="L88" class="LineNr"> 88 </span>  <span class="Comment"># load args into EAX, EBX and ECX</span>
+<span id="L89" class="LineNr"> 89 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+12) to EAX</span>
+<span id="L90" class="LineNr"> 90 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+8) to EBX</span>
+<span id="L91" class="LineNr"> 91 </span>  <span class="Comment"># if EAX == b/EBX</span>
+<span id="L92" class="LineNr"> 92 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX and EBX</span>
+<span id="L93" class="LineNr"> 93 </span>  75/jump-if-unequal  $check_ints_equal:else/disp8
+<span id="L94" class="LineNr"> 94 </span>    <span class="Comment"># print('.')</span>
+<span id="L95" class="LineNr"> 95 </span>      <span class="Comment"># push args</span>
+<span id="L96" class="LineNr"> 96 </span>  68/push  &quot;.&quot;/imm32
+<span id="L97" class="LineNr"> 97 </span>      <span class="Comment"># call</span>
+<span id="L98" class="LineNr"> 98 </span>  e8/call  write_stderr/disp32
+<span id="L99" class="LineNr"> 99 </span>      <span class="Comment"># discard arg</span>
+<span id="L100" class="LineNr">100 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L101" class="LineNr">101 </span>    <span class="Comment"># return</span>
+<span id="L102" class="LineNr">102 </span>  c3/return
+<span id="L103" class="LineNr">103 </span>  <span class="Comment"># else:</span>
+<span id="L104" class="LineNr">104 </span>$check_ints_equal:else:
+<span id="L105" class="LineNr">105 </span>  <span class="Comment"># copy msg into ECX</span>
+<span id="L106" class="LineNr">106 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to ECX</span>
+<span id="L107" class="LineNr">107 </span>    <span class="Comment"># print(ECX)</span>
+<span id="L108" class="LineNr">108 </span>      <span class="Comment"># push args</span>
+<span id="L109" class="LineNr">109 </span>  51/push-ECX
+<span id="L110" class="LineNr">110 </span>      <span class="Comment"># call</span>
+<span id="L111" class="LineNr">111 </span>  e8/call  write_stderr/disp32
+<span id="L112" class="LineNr">112 </span>      <span class="Comment"># discard arg</span>
+<span id="L113" class="LineNr">113 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L114" class="LineNr">114 </span>    <span class="Comment"># print newline</span>
+<span id="L115" class="LineNr">115 </span>      <span class="Comment"># push args</span>
+<span id="L116" class="LineNr">116 </span>  68/push  Newline/imm32
+<span id="L117" class="LineNr">117 </span>      <span class="Comment"># call</span>
+<span id="L118" class="LineNr">118 </span>  e8/call  write_stderr/disp32
+<span id="L119" class="LineNr">119 </span>      <span class="Comment"># discard arg</span>
+<span id="L120" class="LineNr">120 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Comment"># end</span>
+<span id="L122" class="LineNr">122 </span>  c3/return
+<span id="L123" class="LineNr">123 </span>
+<span id="L124" class="LineNr">124 </span><span class="Comment"># compare a null-terminated ascii string with a more idiomatic length-prefixed byte array</span>
+<span id="L125" class="LineNr">125 </span><span class="Comment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
+<span id="L126" class="LineNr">126 </span>argv_equal:  <span class="Comment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
+<span id="L127" class="Folded">127 </span><span class="Folded">+-- 58 lines: # --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------</span>
+<span id="L185" class="Folded">185 </span><span class="Folded">+--134 lines: # tests for argv_equal -----------------------------------------------------------------------------------------------------------------------------------------------------------------------</span>
+<span id="L319" class="LineNr">319 </span>
+<span id="L320" class="LineNr">320 </span>write_stderr:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L321" class="LineNr">321 </span>  <span class="Comment"># save registers</span>
+<span id="L322" class="LineNr">322 </span>  50/push-EAX
+<span id="L323" class="LineNr">323 </span>  51/push-ECX
+<span id="L324" class="LineNr">324 </span>  52/push-EDX
+<span id="L325" class="LineNr">325 </span>  53/push-EBX
+<span id="L326" class="LineNr">326 </span>  <span class="Comment"># write(2/stderr, (data) s+4, (size) *s)</span>
+<span id="L327" class="LineNr">327 </span>    <span class="Comment"># fd = 2 (stderr)</span>
+<span id="L328" class="LineNr">328 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              2/imm32           <span class="Comment"># copy 2 to EBX</span>
+<span id="L329" class="LineNr">329 </span>    <span class="Comment"># x = s+4</span>
+<span id="L330" class="LineNr">330 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+20) to ECX</span>
+<span id="L331" class="LineNr">331 </span>  81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ECX</span>
+<span id="L332" class="LineNr">332 </span>    <span class="Comment"># size = *s</span>
+<span id="L333" class="LineNr">333 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+20) to EDX</span>
+<span id="L334" class="LineNr">334 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
+<span id="L335" class="LineNr">335 </span>    <span class="Comment"># call write()</span>
+<span id="L336" class="LineNr">336 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write     <span class="Comment"># copy 1 to EAX</span>
+<span id="L337" class="LineNr">337 </span>  cd/syscall  0x80/imm8
+<span id="L338" class="LineNr">338 </span>  <span class="Comment"># restore registers</span>
+<span id="L339" class="LineNr">339 </span>  5b/pop-EBX
+<span id="L340" class="LineNr">340 </span>  5a/pop-EDX
+<span id="L341" class="LineNr">341 </span>  59/pop-ECX
+<span id="L342" class="LineNr">342 </span>  58/pop-EAX
+<span id="L343" class="LineNr">343 </span>  <span class="Comment"># end</span>
+<span id="L344" class="LineNr">344 </span>  c3/return
+<span id="L345" class="LineNr">345 </span>
+<span id="L346" class="LineNr">346 </span>write_stdout:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L347" class="LineNr">347 </span>  <span class="Comment"># save registers</span>
+<span id="L348" class="LineNr">348 </span>  50/push-EAX
+<span id="L349" class="LineNr">349 </span>  51/push-ECX
+<span id="L350" class="LineNr">350 </span>  52/push-EDX
+<span id="L351" class="LineNr">351 </span>  53/push-EBX
+<span id="L352" class="LineNr">352 </span>  <span class="Comment"># write(1/stdout, (data) s+4, (size) *s)</span>
+<span id="L353" class="LineNr">353 </span>    <span class="Comment"># fd = 1 (stdout)</span>
+<span id="L354" class="LineNr">354 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EBX</span>
+<span id="L355" class="LineNr">355 </span>    <span class="Comment"># x = s+4</span>
+<span id="L356" class="LineNr">356 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+20) to ECX</span>
+<span id="L357" class="LineNr">357 </span>  81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ECX</span>
+<span id="L358" class="LineNr">358 </span>    <span class="Comment"># size = *s</span>
+<span id="L359" class="LineNr">359 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+20) to EDX</span>
+<span id="L360" class="LineNr">360 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
+<span id="L361" class="LineNr">361 </span>    <span class="Comment"># call write()</span>
+<span id="L362" class="LineNr">362 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write     <span class="Comment"># copy 1 to EAX</span>
+<span id="L363" class="LineNr">363 </span>  cd/syscall  0x80/imm8
+<span id="L364" class="LineNr">364 </span>  <span class="Comment"># restore registers</span>
+<span id="L365" class="LineNr">365 </span>  5b/pop-EBX
+<span id="L366" class="LineNr">366 </span>  5a/pop-EDX
+<span id="L367" class="LineNr">367 </span>  59/pop-ECX
+<span id="L368" class="LineNr">368 </span>  58/pop-EAX
+<span id="L369" class="LineNr">369 </span>  <span class="Comment"># end</span>
+<span id="L370" class="LineNr">370 </span>  c3/return
+<span id="L371" class="LineNr">371 </span>
+<span id="L372" class="LineNr">372 </span>== data
+<span id="L373" class="LineNr">373 </span>Newline:
+<span id="L374" class="LineNr">374 </span>  <span class="Comment"># size</span>
+<span id="L375" class="LineNr">375 </span>  01 00 00 00
+<span id="L376" class="LineNr">376 </span>  <span class="Comment"># data</span>
+<span id="L377" class="LineNr">377 </span>  0a/newline
+<span id="L378" class="LineNr">378 </span>
+<span id="L379" class="LineNr">379 </span><span class="Comment"># for argv_equal tests</span>
+<span id="L380" class="LineNr">380 </span>Null_argv:
+<span id="L381" class="LineNr">381 </span>  00/null
+<span id="L382" class="LineNr">382 </span>Abc_argv:
+<span id="L383" class="LineNr">383 </span>  41/A 62/b 63/c 00/null
+<span id="L384" class="LineNr">384 </span>
+<span id="L385" class="LineNr">385 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:so=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/apps/factorial.subx.html b/html/subx/apps/factorial.subx.html
index 3b03150d..4e11b12f 100644
--- a/html/subx/apps/factorial.subx.html
+++ b/html/subx/apps/factorial.subx.html
@@ -17,6 +17,7 @@ a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .LineNr { color: #444444; }
 .Delimiter { color: #800080; }
+.Folded { color: #a8a8a8; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .SalientComment { color: #00ffff; }
@@ -63,193 +64,200 @@ if ('onhashchange' in window) {
 <span id="L7" class="LineNr">  7 </span><span class="Comment">#   $ echo $?</span>
 <span id="L8" class="LineNr">  8 </span><span class="Comment">#   120</span>
 <span id="L9" class="LineNr">  9 </span><span class="Comment">#</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment"># You can also run an automated test (that does the exact same thing):</span>
+<span id="L10" class="LineNr"> 10 </span><span class="Comment"># You can also run the automated test suite:</span>
 <span id="L11" class="LineNr"> 11 </span><span class="Comment">#   $ subx run apps/factorial test</span>
 <span id="L12" class="LineNr"> 12 </span><span class="Comment"># Expected output:</span>
-<span id="L13" class="LineNr"> 13 </span><span class="Comment">#   .</span>
+<span id="L13" class="LineNr"> 13 </span><span class="Comment">#   ........</span>
 <span id="L14" class="LineNr"> 14 </span><span class="Comment"># Every '.' indicates a passing test. Failing tests get a 'F'.</span>
-<span id="L15" class="LineNr"> 15 </span>
-<span id="L16" class="LineNr"> 16 </span>== code
-<span id="L17" class="LineNr"> 17 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L20" class="LineNr"> 20 </span>
-<span id="L21" class="LineNr"> 21 </span><span class="Comment"># main:</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Comment"># if (argc &gt; 1)</span>
-<span id="L23" class="LineNr"> 23 </span>  8b/copy                         0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *ESP to EAX</span>
-<span id="L24" class="LineNr"> 24 </span>  3d/compare                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># compare EAX with 1</span>
-<span id="L25" class="LineNr"> 25 </span>  7e/jump-if-lesser-or-equal  $run_main/disp8
-<span id="L26" class="LineNr"> 26 </span>  <span class="Comment"># and if (argv[1] == &quot;test&quot;)</span>
-<span id="L27" class="LineNr"> 27 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+8) to EAX</span>
-<span id="L28" class="LineNr"> 28 </span>    <span class="Comment"># push args</span>
-<span id="L29" class="LineNr"> 29 </span>  68/push  Test_argv/imm32
+<span id="L15" class="LineNr"> 15 </span><span class="Comment"># When running tests the exit status doesn't mean anything. Yet.</span>
+<span id="L16" class="LineNr"> 16 </span>
+<span id="L17" class="LineNr"> 17 </span>== code
+<span id="L18" class="LineNr"> 18 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L19" class="LineNr"> 19 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L21" class="LineNr"> 21 </span>
+<span id="L22" class="LineNr"> 22 </span><span class="Comment"># main:</span>
+<span id="L23" class="LineNr"> 23 </span>  <span class="Comment"># if (argc &gt; 1)</span>
+<span id="L24" class="LineNr"> 24 </span>  8b/copy                         0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *ESP to EAX</span>
+<span id="L25" class="LineNr"> 25 </span>  3d/compare                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># compare EAX with 1</span>
+<span id="L26" class="LineNr"> 26 </span>  7e/jump-if-lesser-or-equal  $run_main/disp8
+<span id="L27" class="LineNr"> 27 </span>  <span class="Comment"># and if (argv[1] == &quot;test&quot;)</span>
+<span id="L28" class="LineNr"> 28 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+8) to EAX</span>
+<span id="L29" class="LineNr"> 29 </span>    <span class="Comment"># push args</span>
 <span id="L30" class="LineNr"> 30 </span>  50/push-EAX
-<span id="L31" class="LineNr"> 31 </span>    <span class="Comment"># call</span>
-<span id="L32" class="LineNr"> 32 </span>  e8/call  argv_equal/disp32
-<span id="L33" class="LineNr"> 33 </span>    <span class="Comment"># discard args</span>
-<span id="L34" class="LineNr"> 34 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add 8 to ESP</span>
-<span id="L35" class="LineNr"> 35 </span>    <span class="Comment"># check result</span>
-<span id="L36" class="LineNr"> 36 </span>  3d/compare                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># compare EAX with 1</span>
-<span id="L37" class="LineNr"> 37 </span>  75/jump-if-not-equal  $run_main/disp8
-<span id="L38" class="LineNr"> 38 </span>  <span class="Comment"># then</span>
-<span id="L39" class="LineNr"> 39 </span>  e8/call  run_tests/disp32
-<span id="L40" class="LineNr"> 40 </span>  eb/jump  $main_exit/disp8
-<span id="L41" class="LineNr"> 41 </span>  <span class="Comment"># else EAX &lt;- factorial(5)</span>
-<span id="L42" class="LineNr"> 42 </span>$run_main:
-<span id="L43" class="LineNr"> 43 </span>    <span class="Comment"># push arg</span>
-<span id="L44" class="LineNr"> 44 </span>  68/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              5/imm32           <span class="Comment"># push 5</span>
-<span id="L45" class="LineNr"> 45 </span>    <span class="Comment"># EAX &lt;- call</span>
-<span id="L46" class="LineNr"> 46 </span>  e8/call                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          factorial/disp32
-<span id="L47" class="LineNr"> 47 </span>    <span class="Comment"># discard arg</span>
-<span id="L48" class="LineNr"> 48 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
-<span id="L49" class="LineNr"> 49 </span>$main_exit:
-<span id="L50" class="LineNr"> 50 </span>  <span class="Comment"># exit(EAX)</span>
-<span id="L51" class="LineNr"> 51 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to EBX</span>
-<span id="L52" class="LineNr"> 52 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EAX</span>
-<span id="L53" class="LineNr"> 53 </span>  cd/syscall  0x80/imm8
-<span id="L54" class="LineNr"> 54 </span>
-<span id="L55" class="LineNr"> 55 </span><span class="Comment"># factorial(n)</span>
-<span id="L56" class="LineNr"> 56 </span>factorial:
-<span id="L57" class="LineNr"> 57 </span>  <span class="Comment"># initialize EAX to 1 (base case)</span>
-<span id="L58" class="LineNr"> 58 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EAX</span>
-<span id="L59" class="LineNr"> 59 </span>  <span class="Comment"># if (n &lt;= 1) jump exit</span>
-<span id="L60" class="LineNr"> 60 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8         1/imm32           <span class="Comment"># compare *(ESP+4) with 1</span>
-<span id="L61" class="LineNr"> 61 </span>  7e/jump-if-&lt;=                  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          $factorial:exit/disp8             <span class="Comment"># jump if &lt;= to $factorial:exit</span>
-<span id="L62" class="LineNr"> 62 </span>  <span class="Comment"># EBX: n-1</span>
-<span id="L63" class="LineNr"> 63 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              3/r32/EBX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EBX</span>
-<span id="L64" class="LineNr"> 64 </span>  81          5/subop/subtract    3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># subtract 1 from EBX</span>
-<span id="L65" class="LineNr"> 65 </span>  <span class="Comment"># prepare call</span>
-<span id="L66" class="LineNr"> 66 </span>  55/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EBP</span>
-<span id="L67" class="LineNr"> 67 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L68" class="LineNr"> 68 </span>  <span class="Comment"># EAX: factorial(n-1)</span>
-<span id="L69" class="LineNr"> 69 </span>  53/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EBX</span>
-<span id="L70" class="LineNr"> 70 </span>  e8/call                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          factorial/disp32
-<span id="L71" class="LineNr"> 71 </span>  <span class="Comment"># discard arg</span>
-<span id="L72" class="LineNr"> 72 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
-<span id="L73" class="LineNr"> 73 </span>  <span class="Comment"># clean up after call</span>
-<span id="L74" class="LineNr"> 74 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
-<span id="L75" class="LineNr"> 75 </span>  5d/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># pop to EBP</span>
-<span id="L76" class="LineNr"> 76 </span>  <span class="Comment"># refresh n</span>
-<span id="L77" class="LineNr"> 77 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              2/r32/EDX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EDX</span>
-<span id="L78" class="LineNr"> 78 </span>  <span class="Comment"># return n * factorial(n-1)</span>
-<span id="L79" class="LineNr"> 79 </span>  f7          4/subop/multiply    1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none                          4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># multiply *(ESP+4) (n) into EAX (factorial(n-1))</span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Comment"># TODO: check for overflow</span>
-<span id="L81" class="LineNr"> 81 </span>$factorial:exit:
-<span id="L82" class="LineNr"> 82 </span>  c3/return
-<span id="L83" class="LineNr"> 83 </span>
-<span id="L84" class="LineNr"> 84 </span>test_factorial:
-<span id="L85" class="LineNr"> 85 </span>  <span class="Comment"># factorial(5)</span>
-<span id="L86" class="LineNr"> 86 </span>    <span class="Comment"># push arg</span>
-<span id="L87" class="LineNr"> 87 </span>  68/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              5/imm32           <span class="Comment"># push 5</span>
-<span id="L88" class="LineNr"> 88 </span>    <span class="Comment"># call</span>
-<span id="L89" class="LineNr"> 89 </span>  e8/call                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          factorial/disp32
-<span id="L90" class="LineNr"> 90 </span>    <span class="Comment"># discard arg</span>
-<span id="L91" class="LineNr"> 91 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
-<span id="L92" class="LineNr"> 92 </span>  <span class="Comment"># if EAX == 120</span>
-<span id="L93" class="LineNr"> 93 </span>  3d/compare                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x78/imm32/120    <span class="Comment"># compare EAX with 120</span>
-<span id="L94" class="LineNr"> 94 </span>  75/jump-if-unequal             <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          $test_factorial:else/disp8
-<span id="L95" class="LineNr"> 95 </span>    <span class="Comment"># print('.')</span>
-<span id="L96" class="LineNr"> 96 </span>      <span class="Comment"># push args</span>
-<span id="L97" class="LineNr"> 97 </span>  68/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              Test_passed/imm32
-<span id="L98" class="LineNr"> 98 </span>      <span class="Comment"># call</span>
-<span id="L99" class="LineNr"> 99 </span>  e8/call                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          write_stderr/disp32
-<span id="L100" class="LineNr">100 </span>      <span class="Comment"># discard arg</span>
-<span id="L101" class="LineNr">101 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
-<span id="L102" class="LineNr">102 </span>    <span class="Comment"># return</span>
+<span id="L31" class="LineNr"> 31 </span>  68/push  &quot;test&quot;/imm32
+<span id="L32" class="LineNr"> 32 </span>    <span class="Comment"># call</span>
+<span id="L33" class="LineNr"> 33 </span>  e8/call  argv_equal/disp32
+<span id="L34" class="LineNr"> 34 </span>    <span class="Comment"># discard args</span>
+<span id="L35" class="LineNr"> 35 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add 8 to ESP</span>
+<span id="L36" class="LineNr"> 36 </span>    <span class="Comment"># check result</span>
+<span id="L37" class="LineNr"> 37 </span>  3d/compare                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># compare EAX with 1</span>
+<span id="L38" class="LineNr"> 38 </span>  75/jump-if-not-equal  $run_main/disp8
+<span id="L39" class="LineNr"> 39 </span>  <span class="Comment"># then</span>
+<span id="L40" class="LineNr"> 40 </span>  e8/call  run_tests/disp32
+<span id="L41" class="LineNr"> 41 </span>  eb/jump  $main_exit/disp8
+<span id="L42" class="LineNr"> 42 </span>  <span class="Comment"># else EAX &lt;- factorial(5)</span>
+<span id="L43" class="LineNr"> 43 </span>$run_main:
+<span id="L44" class="LineNr"> 44 </span>    <span class="Comment"># push arg</span>
+<span id="L45" class="LineNr"> 45 </span>  68/push  5/imm32
+<span id="L46" class="LineNr"> 46 </span>    <span class="Comment"># EAX &lt;- call</span>
+<span id="L47" class="LineNr"> 47 </span>  e8/call  factorial/disp32
+<span id="L48" class="LineNr"> 48 </span>    <span class="Comment"># discard arg</span>
+<span id="L49" class="LineNr"> 49 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L50" class="LineNr"> 50 </span>$main_exit:
+<span id="L51" class="LineNr"> 51 </span>  <span class="Comment"># exit(EAX)</span>
+<span id="L52" class="LineNr"> 52 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to EBX</span>
+<span id="L53" class="LineNr"> 53 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EAX</span>
+<span id="L54" class="LineNr"> 54 </span>  cd/syscall  0x80/imm8
+<span id="L55" class="LineNr"> 55 </span>
+<span id="L56" class="LineNr"> 56 </span><span class="Comment"># factorial(n)</span>
+<span id="L57" class="LineNr"> 57 </span>factorial:
+<span id="L58" class="LineNr"> 58 </span>  <span class="Comment"># initialize EAX to 1 (base case)</span>
+<span id="L59" class="LineNr"> 59 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EAX</span>
+<span id="L60" class="LineNr"> 60 </span>  <span class="Comment"># if (n &lt;= 1) jump exit</span>
+<span id="L61" class="LineNr"> 61 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8         1/imm32           <span class="Comment"># compare *(ESP+4) with 1</span>
+<span id="L62" class="LineNr"> 62 </span>  7e/jump-if-&lt;=  $factorial:exit/disp8
+<span id="L63" class="LineNr"> 63 </span>  <span class="Comment"># EBX: n-1</span>
+<span id="L64" class="LineNr"> 64 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              3/r32/EBX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EBX</span>
+<span id="L65" class="LineNr"> 65 </span>  81          5/subop/subtract    3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># subtract 1 from EBX</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="Comment"># prepare call</span>
+<span id="L67" class="LineNr"> 67 </span>  55/push-EBP
+<span id="L68" class="LineNr"> 68 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
+<span id="L69" class="LineNr"> 69 </span>  <span class="Comment"># EAX: factorial(n-1)</span>
+<span id="L70" class="LineNr"> 70 </span>  53/push-EBX
+<span id="L71" class="LineNr"> 71 </span>  e8/call                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          factorial/disp32
+<span id="L72" class="LineNr"> 72 </span>  <span class="Comment"># discard arg</span>
+<span id="L73" class="LineNr"> 73 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="Comment"># clean up after call</span>
+<span id="L75" class="LineNr"> 75 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L76" class="LineNr"> 76 </span>  5d/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># pop to EBP</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="Comment"># refresh n</span>
+<span id="L78" class="LineNr"> 78 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              2/r32/EDX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EDX</span>
+<span id="L79" class="LineNr"> 79 </span>  <span class="Comment"># return n * factorial(n-1)</span>
+<span id="L80" class="LineNr"> 80 </span>  f7          4/subop/multiply    1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none                          4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># multiply *(ESP+4) (n) into EAX (factorial(n-1))</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Comment"># TODO: check for overflow</span>
+<span id="L82" class="LineNr"> 82 </span>$factorial:exit:
+<span id="L83" class="LineNr"> 83 </span>  c3/return
+<span id="L84" class="LineNr"> 84 </span>
+<span id="L85" class="LineNr"> 85 </span>test_factorial:
+<span id="L86" class="LineNr"> 86 </span>  <span class="Comment"># factorial(5)</span>
+<span id="L87" class="LineNr"> 87 </span>    <span class="Comment"># push arg</span>
+<span id="L88" class="LineNr"> 88 </span>  68/push  5/imm32
+<span id="L89" class="LineNr"> 89 </span>    <span class="Comment"># call</span>
+<span id="L90" class="LineNr"> 90 </span>  e8/call  factorial/disp32
+<span id="L91" class="LineNr"> 91 </span>    <span class="Comment"># discard arg</span>
+<span id="L92" class="LineNr"> 92 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Comment"># check_ints_equal(EAX, 120, failure message)</span>
+<span id="L94" class="LineNr"> 94 </span>    <span class="Comment"># push args</span>
+<span id="L95" class="LineNr"> 95 </span>  50/push-EAX
+<span id="L96" class="LineNr"> 96 </span>  68/push  0x78/imm32/expected-120
+<span id="L97" class="LineNr"> 97 </span>  68/push  &quot;F - test_factorial&quot;/imm32
+<span id="L98" class="LineNr"> 98 </span>    <span class="Comment"># call</span>
+<span id="L99" class="LineNr"> 99 </span>  e8/call  check_ints_equal/disp32
+<span id="L100" class="LineNr">100 </span>    <span class="Comment"># discard args</span>
+<span id="L101" class="LineNr">101 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add 12 to ESP</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Comment"># end</span>
 <span id="L103" class="LineNr">103 </span>  c3/return
-<span id="L104" class="LineNr">104 </span>  <span class="Comment"># else:</span>
-<span id="L105" class="LineNr">105 </span>$test_factorial:else:
-<span id="L106" class="LineNr">106 </span>    <span class="Comment"># print('F')</span>
-<span id="L107" class="LineNr">107 </span>      <span class="Comment"># push args</span>
-<span id="L108" class="LineNr">108 </span>  68/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              Test_failed/imm32
-<span id="L109" class="LineNr">109 </span>      <span class="Comment"># call</span>
-<span id="L110" class="LineNr">110 </span>  e8/call                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          write_stderr/disp32
-<span id="L111" class="LineNr">111 </span>      <span class="Comment"># discard arg</span>
-<span id="L112" class="LineNr">112 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
-<span id="L113" class="LineNr">113 </span>  <span class="Comment"># end</span>
-<span id="L114" class="LineNr">114 </span>  c3/return
-<span id="L115" class="LineNr">115 </span>
-<span id="L116" class="LineNr">116 </span><span class="SalientComment">## helpers</span>
-<span id="L117" class="LineNr">117 </span>
-<span id="L118" class="LineNr">118 </span><span class="Comment"># compare two null-terminated ascii strings</span>
-<span id="L119" class="LineNr">119 </span><span class="Comment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
-<span id="L120" class="LineNr">120 </span>argv_equal:  <span class="Comment"># (s1, s2) : null-terminated ascii strings -&gt; EAX : boolean</span>
-<span id="L121" class="LineNr">121 </span>  <span class="Comment"># initialize s1 (ECX) and s2 (EDX)</span>
-<span id="L122" class="LineNr">122 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+8) to ECX</span>
-<span id="L123" class="LineNr">123 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EDX</span>
-<span id="L124" class="LineNr">124 </span>  <span class="Comment"># while (true)</span>
-<span id="L125" class="LineNr">125 </span>$argv_loop:
-<span id="L126" class="LineNr">126 </span>    <span class="Comment"># c1/EAX, c2/EBX = *s1, *s2</span>
-<span id="L127" class="LineNr">127 </span>  b8/copy  0/imm32  <span class="Comment"># clear EAX</span>
-<span id="L128" class="LineNr">128 </span>  8a/copy                         0/mod/indirect  1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *ECX to lower byte of EAX</span>
-<span id="L129" class="LineNr">129 </span>  bb/copy  0/imm32  <span class="Comment"># clear EBX</span>
-<span id="L130" class="LineNr">130 </span>  8a/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDX to lower byte of EBX</span>
-<span id="L131" class="LineNr">131 </span>    <span class="Comment"># if (c1 == 0) break</span>
-<span id="L132" class="LineNr">132 </span>  3d/compare                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># compare EAX with 0</span>
-<span id="L133" class="LineNr">133 </span>  74/jump-if-equal  $argv_break/disp8
-<span id="L134" class="LineNr">134 </span>    <span class="Comment"># if (c1 != c2) return false</span>
-<span id="L135" class="LineNr">135 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with EBX</span>
-<span id="L136" class="LineNr">136 </span>  75/jump-if-not-equal  $argv_fail/disp8
-<span id="L137" class="LineNr">137 </span>    <span class="Comment"># ++s1, ++s2</span>
-<span id="L138" class="LineNr">138 </span>  41/inc-ECX
-<span id="L139" class="LineNr">139 </span>  42/inc-EDX
-<span id="L140" class="LineNr">140 </span>  <span class="Comment"># end while</span>
-<span id="L141" class="LineNr">141 </span>  eb/jump  $argv_loop/disp8
-<span id="L142" class="LineNr">142 </span>$argv_break:
-<span id="L143" class="LineNr">143 </span>  <span class="Comment"># if (c2 == 0) return true</span>
-<span id="L144" class="LineNr">144 </span>  81          7/subop/compare     3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># compare EBX with 0</span>
-<span id="L145" class="LineNr">145 </span>  75/jump-if-not-equal  $argv_fail/disp8
-<span id="L146" class="LineNr">146 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EAX</span>
-<span id="L147" class="LineNr">147 </span>  c3/return
-<span id="L148" class="LineNr">148 </span>  <span class="Comment"># return false</span>
-<span id="L149" class="LineNr">149 </span>$argv_fail:
-<span id="L150" class="LineNr">150 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy 0 to EAX</span>
-<span id="L151" class="LineNr">151 </span>  c3/return
-<span id="L152" class="LineNr">152 </span>
-<span id="L153" class="LineNr">153 </span>write_stderr:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Comment"># save registers</span>
-<span id="L155" class="LineNr">155 </span>  50/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EAX</span>
-<span id="L156" class="LineNr">156 </span>  51/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push ECX</span>
-<span id="L157" class="LineNr">157 </span>  52/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EDX</span>
-<span id="L158" class="LineNr">158 </span>  53/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EBX</span>
-<span id="L159" class="LineNr">159 </span>  <span class="Comment"># write(2/stderr, (data) s+4, (size) *s)</span>
-<span id="L160" class="LineNr">160 </span>    <span class="Comment"># fd = 2 (stderr)</span>
-<span id="L161" class="LineNr">161 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              2/imm32           <span class="Comment"># copy 2 to EBX</span>
-<span id="L162" class="LineNr">162 </span>    <span class="Comment"># x = s+4</span>
-<span id="L163" class="LineNr">163 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+20) to ECX</span>
-<span id="L164" class="LineNr">164 </span>  81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ECX</span>
-<span id="L165" class="LineNr">165 </span>    <span class="Comment"># size = *s</span>
-<span id="L166" class="LineNr">166 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+20) to EDX</span>
-<span id="L167" class="LineNr">167 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
-<span id="L168" class="LineNr">168 </span>    <span class="Comment"># call write()</span>
-<span id="L169" class="LineNr">169 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write     <span class="Comment"># copy 1 to EAX</span>
-<span id="L170" class="LineNr">170 </span>  cd/syscall  0x80/imm8
-<span id="L171" class="LineNr">171 </span>  <span class="Comment"># restore registers</span>
-<span id="L172" class="LineNr">172 </span>  5b/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># pop EBX</span>
-<span id="L173" class="LineNr">173 </span>  5a/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># pop EDX</span>
-<span id="L174" class="LineNr">174 </span>  59/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># pop ECX</span>
-<span id="L175" class="LineNr">175 </span>  58/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># pop EAX</span>
-<span id="L176" class="LineNr">176 </span>  <span class="Comment"># end</span>
-<span id="L177" class="LineNr">177 </span>  c3/return
-<span id="L178" class="LineNr">178 </span>
-<span id="L179" class="LineNr">179 </span>== data
-<span id="L180" class="LineNr">180 </span>Test_argv:  <span class="Comment"># null-terminated</span>
-<span id="L181" class="LineNr">181 </span>  <span class="Comment"># data</span>
-<span id="L182" class="LineNr">182 </span>  74/t 65/e 73/s 74/t 00/null
-<span id="L183" class="LineNr">183 </span>
-<span id="L184" class="LineNr">184 </span>Test_passed:
-<span id="L185" class="LineNr">185 </span>  <span class="Comment"># size</span>
-<span id="L186" class="LineNr">186 </span>  01 00 00 00
-<span id="L187" class="LineNr">187 </span>  <span class="Comment"># data</span>
-<span id="L188" class="LineNr">188 </span>  2e/dot
-<span id="L189" class="LineNr">189 </span>
-<span id="L190" class="LineNr">190 </span>Test_failed:
-<span id="L191" class="LineNr">191 </span>  <span class="Comment"># size</span>
-<span id="L192" class="LineNr">192 </span>  01 00 00 00
-<span id="L193" class="LineNr">193 </span>  <span class="Comment"># data</span>
-<span id="L194" class="LineNr">194 </span>  46/F
-<span id="L195" class="LineNr">195 </span>
-<span id="L196" class="LineNr">196 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:so=0</span>
+<span id="L104" class="LineNr">104 </span>
+<span id="L105" class="LineNr">105 </span><span class="SalientComment">## helpers</span>
+<span id="L106" class="LineNr">106 </span>
+<span id="L107" class="LineNr">107 </span><span class="Comment"># print msg to stderr if a != b, otherwise print &quot;.&quot;</span>
+<span id="L108" class="LineNr">108 </span>check_ints_equal:  <span class="Comment"># (a : int, b : int, msg : (address array byte)) -&gt; boolean</span>
+<span id="L109" class="LineNr">109 </span>  <span class="Comment"># load args into EAX, EBX and ECX</span>
+<span id="L110" class="LineNr">110 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+12) to EAX</span>
+<span id="L111" class="LineNr">111 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+8) to EBX</span>
+<span id="L112" class="LineNr">112 </span>  <span class="Comment"># if EAX == b/EBX</span>
+<span id="L113" class="LineNr">113 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX and EBX</span>
+<span id="L114" class="LineNr">114 </span>  75/jump-if-unequal  $check_ints_equal:else/disp8
+<span id="L115" class="LineNr">115 </span>    <span class="Comment"># print('.')</span>
+<span id="L116" class="LineNr">116 </span>      <span class="Comment"># push args</span>
+<span id="L117" class="LineNr">117 </span>  68/push  &quot;.&quot;/imm32
+<span id="L118" class="LineNr">118 </span>      <span class="Comment"># call</span>
+<span id="L119" class="LineNr">119 </span>  e8/call  write_stderr/disp32
+<span id="L120" class="LineNr">120 </span>      <span class="Comment"># discard arg</span>
+<span id="L121" class="LineNr">121 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L122" class="LineNr">122 </span>    <span class="Comment"># return</span>
+<span id="L123" class="LineNr">123 </span>  c3/return
+<span id="L124" class="LineNr">124 </span>  <span class="Comment"># else:</span>
+<span id="L125" class="LineNr">125 </span>$check_ints_equal:else:
+<span id="L126" class="LineNr">126 </span>  <span class="Comment"># copy msg into ECX</span>
+<span id="L127" class="LineNr">127 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to ECX</span>
+<span id="L128" class="LineNr">128 </span>    <span class="Comment"># print(ECX)</span>
+<span id="L129" class="LineNr">129 </span>      <span class="Comment"># push args</span>
+<span id="L130" class="LineNr">130 </span>  51/push-ECX
+<span id="L131" class="LineNr">131 </span>      <span class="Comment"># call</span>
+<span id="L132" class="LineNr">132 </span>  e8/call  write_stderr/disp32
+<span id="L133" class="LineNr">133 </span>      <span class="Comment"># discard arg</span>
+<span id="L134" class="LineNr">134 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L135" class="LineNr">135 </span>    <span class="Comment"># print newline</span>
+<span id="L136" class="LineNr">136 </span>      <span class="Comment"># push args</span>
+<span id="L137" class="LineNr">137 </span>  68/push  Newline/imm32
+<span id="L138" class="LineNr">138 </span>      <span class="Comment"># call</span>
+<span id="L139" class="LineNr">139 </span>  e8/call  write_stderr/disp32
+<span id="L140" class="LineNr">140 </span>      <span class="Comment"># discard arg</span>
+<span id="L141" class="LineNr">141 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L142" class="LineNr">142 </span>  <span class="Comment"># end</span>
+<span id="L143" class="LineNr">143 </span>  c3/return
+<span id="L144" class="LineNr">144 </span>
+<span id="L145" class="LineNr">145 </span><span class="Comment"># compare a null-terminated ascii string with a more idiomatic length-prefixed byte array</span>
+<span id="L146" class="LineNr">146 </span><span class="Comment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
+<span id="L147" class="LineNr">147 </span>argv_equal:  <span class="Comment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
+<span id="L148" class="LineNr">148 </span>  <span class="Comment"># pseudocode:</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Comment">#   initialize n = b.length</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Comment">#   initialize s1 = s</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Comment">#   initialize s2 = b.data</span>
+<span id="L152" class="LineNr">152 </span>  <span class="Comment">#   i = 0</span>
+<span id="L153" class="LineNr">153 </span>  <span class="Comment">#   for (i = 0; i &lt; n; ++n)</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Comment">#     c1 = *s1</span>
+<span id="L155" class="LineNr">155 </span>  <span class="Comment">#     c2 = *s2</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Comment">#     if c1 == 0</span>
+<span id="L157" class="LineNr">157 </span>  <span class="Comment">#       return false</span>
+<span id="L158" class="LineNr">158 </span>  <span class="Comment">#     if c1 != c2</span>
+<span id="L159" class="LineNr">159 </span>  <span class="Comment">#       return false</span>
+<span id="L160" class="LineNr">160 </span>  <span class="Comment">#   return *s1 == 0</span>
+<span id="L161" class="Folded">161 </span><span class="Folded">+-- 45 lines: # --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------</span>
+<span id="L206" class="Folded">206 </span><span class="Folded">+--134 lines: # tests for argv_equal -----------------------------------------------------------------------------------------------------------------------------------------------------------------------</span>
+<span id="L340" class="LineNr">340 </span>
+<span id="L341" class="LineNr">341 </span>write_stderr:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L342" class="LineNr">342 </span>  <span class="Comment"># save registers</span>
+<span id="L343" class="LineNr">343 </span>  50/push-EAX
+<span id="L344" class="LineNr">344 </span>  51/push-ECX
+<span id="L345" class="LineNr">345 </span>  52/push-EDX
+<span id="L346" class="LineNr">346 </span>  53/push-EBX
+<span id="L347" class="LineNr">347 </span>  <span class="Comment"># write(2/stderr, (data) s+4, (size) *s)</span>
+<span id="L348" class="LineNr">348 </span>    <span class="Comment"># fd = 2 (stderr)</span>
+<span id="L349" class="LineNr">349 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              2/imm32           <span class="Comment"># copy 2 to EBX</span>
+<span id="L350" class="LineNr">350 </span>    <span class="Comment"># x = s+4</span>
+<span id="L351" class="LineNr">351 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+20) to ECX</span>
+<span id="L352" class="LineNr">352 </span>  81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ECX</span>
+<span id="L353" class="LineNr">353 </span>    <span class="Comment"># size = *s</span>
+<span id="L354" class="LineNr">354 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+20) to EDX</span>
+<span id="L355" class="LineNr">355 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
+<span id="L356" class="LineNr">356 </span>    <span class="Comment"># call write()</span>
+<span id="L357" class="LineNr">357 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write     <span class="Comment"># copy 1 to EAX</span>
+<span id="L358" class="LineNr">358 </span>  cd/syscall  0x80/imm8
+<span id="L359" class="LineNr">359 </span>  <span class="Comment"># restore registers</span>
+<span id="L360" class="LineNr">360 </span>  5b/pop-EBX
+<span id="L361" class="LineNr">361 </span>  5a/pop-EDX
+<span id="L362" class="LineNr">362 </span>  59/pop-ECX
+<span id="L363" class="LineNr">363 </span>  58/pop-EAX
+<span id="L364" class="LineNr">364 </span>  <span class="Comment"># end</span>
+<span id="L365" class="LineNr">365 </span>  c3/return
+<span id="L366" class="LineNr">366 </span>
+<span id="L367" class="LineNr">367 </span>== data
+<span id="L368" class="LineNr">368 </span>Newline:
+<span id="L369" class="LineNr">369 </span>  <span class="Comment"># size</span>
+<span id="L370" class="LineNr">370 </span>  01 00 00 00
+<span id="L371" class="LineNr">371 </span>  <span class="Comment"># data</span>
+<span id="L372" class="LineNr">372 </span>  0a/newline
+<span id="L373" class="LineNr">373 </span>
+<span id="L374" class="LineNr">374 </span><span class="Comment"># for argv_equal tests</span>
+<span id="L375" class="LineNr">375 </span>Null_argv:
+<span id="L376" class="LineNr">376 </span>  00/null
+<span id="L377" class="LineNr">377 </span>Abc_argv:
+<span id="L378" class="LineNr">378 </span>  41/A 62/b 63/c 00/null
+<span id="L379" class="LineNr">379 </span>
+<span id="L380" class="LineNr">380 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:so=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex10.subx.html b/html/subx/examples/ex10.subx.html
index 8ab82466..8e7a698e 100644
--- a/html/subx/examples/ex10.subx.html
+++ b/html/subx/examples/ex10.subx.html
@@ -80,8 +80,8 @@ if ('onhashchange' in window) {
 <span id="L24" class="LineNr">24 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+12) to EBX</span>
 <span id="L25" class="LineNr">25 </span>  <span class="Comment"># call argv_equal(s1, s2)</span>
 <span id="L26" class="LineNr">26 </span>    <span class="Comment"># push args</span>
-<span id="L27" class="LineNr">27 </span>  50/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EAX</span>
-<span id="L28" class="LineNr">28 </span>  53/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EBX</span>
+<span id="L27" class="LineNr">27 </span>  50/push-EAX
+<span id="L28" class="LineNr">28 </span>  53/push-EBX
 <span id="L29" class="LineNr">29 </span>    <span class="Comment"># call</span>
 <span id="L30" class="LineNr">30 </span>  e8/call argv_equal/disp32
 <span id="L31" class="LineNr">31 </span>  <span class="Comment"># exit(EAX)</span>
diff --git a/html/subx/examples/ex11.subx.html b/html/subx/examples/ex11.subx.html
new file mode 100644
index 00000000..f0fd07c2
--- /dev/null
+++ b/html/subx/examples/ex11.subx.html
@@ -0,0 +1,364 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/examples/ex11.subx</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<style type="text/css">
+<!--
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
+body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+a { color:#eeeeee; text-decoration: none; }
+a:hover { text-decoration: underline; }
+* { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
+.Delimiter { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr">  1 </span><span class="SalientComment">## Null-terminated vs length-prefixed ascii strings.</span>
+<span id="L2" class="LineNr">  2 </span><span class="Comment">#</span>
+<span id="L3" class="LineNr">  3 </span><span class="Comment"># By default we create strings with a 4-byte length prefix rather than a null suffix.</span>
+<span id="L4" class="LineNr">  4 </span><span class="Comment"># However, commandline arguments come null-prefixed from the Linux kernel.</span>
+<span id="L5" class="LineNr">  5 </span><span class="Comment"># This example shows a helper that can compare a commandline argument with the</span>
+<span id="L6" class="LineNr">  6 </span><span class="Comment"># (length-prefixed) literal string &quot;target&quot;.</span>
+<span id="L7" class="LineNr">  7 </span><span class="Comment">#</span>
+<span id="L8" class="LineNr">  8 </span><span class="Comment"># To run:</span>
+<span id="L9" class="LineNr">  9 </span><span class="Comment">#   $ subx translate ex11.subx ex11</span>
+<span id="L10" class="LineNr"> 10 </span><span class="Comment">#   $ subx run ex11  # runs a series of tests</span>
+<span id="L11" class="LineNr"> 11 </span><span class="Comment">#   ......  # all tests pass</span>
+<span id="L12" class="LineNr"> 12 </span><span class="Comment">#</span>
+<span id="L13" class="LineNr"> 13 </span><span class="Comment"># (We can't yet run the tests when given a &quot;test&quot; commandline argument,</span>
+<span id="L14" class="LineNr"> 14 </span><span class="Comment"># because checking for it would require the function being tested! Breakage</span>
+<span id="L15" class="LineNr"> 15 </span><span class="Comment"># would cause tests to not run, rather than to fail as we'd like.)</span>
+<span id="L16" class="LineNr"> 16 </span>
+<span id="L17" class="LineNr"> 17 </span>== code
+<span id="L18" class="LineNr"> 18 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L19" class="LineNr"> 19 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L21" class="LineNr"> 21 </span>
+<span id="L22" class="LineNr"> 22 </span><span class="Comment"># main:</span>
+<span id="L23" class="LineNr"> 23 </span>  e8/call  run_tests/disp32  <span class="Comment"># 'run_tests' is a function created automatically by SubX. It calls all functions that start with 'test_'.</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="Comment"># exit(EAX)</span>
+<span id="L25" class="LineNr"> 25 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to EBX</span>
+<span id="L26" class="LineNr"> 26 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EAX</span>
+<span id="L27" class="LineNr"> 27 </span>  cd/syscall  0x80/imm8
+<span id="L28" class="LineNr"> 28 </span>
+<span id="L29" class="LineNr"> 29 </span><span class="Comment"># compare a null-terminated ascii string with a more idiomatic length-prefixed byte array</span>
+<span id="L30" class="LineNr"> 30 </span><span class="Comment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
+<span id="L31" class="LineNr"> 31 </span>argv_equal:  <span class="Comment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="Comment"># pseudocode:</span>
+<span id="L33" class="LineNr"> 33 </span>  <span class="Comment">#   initialize n = b.length</span>
+<span id="L34" class="LineNr"> 34 </span>  <span class="Comment">#   initialize s1 = s</span>
+<span id="L35" class="LineNr"> 35 </span>  <span class="Comment">#   initialize s2 = b.data</span>
+<span id="L36" class="LineNr"> 36 </span>  <span class="Comment">#   i = 0</span>
+<span id="L37" class="LineNr"> 37 </span>  <span class="Comment">#   for (i = 0; i &lt; n; ++n)</span>
+<span id="L38" class="LineNr"> 38 </span>  <span class="Comment">#     c1 = *s1</span>
+<span id="L39" class="LineNr"> 39 </span>  <span class="Comment">#     c2 = *s2</span>
+<span id="L40" class="LineNr"> 40 </span>  <span class="Comment">#     if c1 == 0</span>
+<span id="L41" class="LineNr"> 41 </span>  <span class="Comment">#       return false</span>
+<span id="L42" class="LineNr"> 42 </span>  <span class="Comment">#     if c1 != c2</span>
+<span id="L43" class="LineNr"> 43 </span>  <span class="Comment">#       return false</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="Comment">#   return *s1 == 0</span>
+<span id="L45" class="LineNr"> 45 </span>
+<span id="L46" class="LineNr"> 46 </span>  <span class="Comment"># initialize s into EDI</span>
+<span id="L47" class="LineNr"> 47 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          7/r32/EDI   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+8) to EDI</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="Comment"># initialize benchmark length n into EDX</span>
+<span id="L49" class="LineNr"> 49 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EDX</span>
+<span id="L50" class="LineNr"> 50 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
+<span id="L51" class="LineNr"> 51 </span>  <span class="Comment"># initialize benchmark data into ESI</span>
+<span id="L52" class="LineNr"> 52 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          6/r32/ESI   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to ESI</span>
+<span id="L53" class="LineNr"> 53 </span>  81          0/subop/add         3/mod/direct    6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESI</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="Comment"># initialize loop counter i into ECX</span>
+<span id="L55" class="LineNr"> 55 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32/exit      <span class="Comment"># copy 1 to ECX</span>
+<span id="L56" class="LineNr"> 56 </span>  <span class="Comment"># while (i/ECX &lt; n/EDX)</span>
+<span id="L57" class="LineNr"> 57 </span>$argv_loop:
+<span id="L58" class="LineNr"> 58 </span>  39/compare                      3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare ECX with EDX</span>
+<span id="L59" class="LineNr"> 59 </span>  74/jump-if-equal  $argv_break/disp8
+<span id="L60" class="LineNr"> 60 </span>    <span class="Comment"># c1/EAX, c2/EBX = *s, *benchmark</span>
+<span id="L61" class="LineNr"> 61 </span>  b8/copy  0/imm32  <span class="Comment"># clear EAX</span>
+<span id="L62" class="LineNr"> 62 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDI to lower byte of EAX</span>
+<span id="L63" class="LineNr"> 63 </span>  bb/copy  0/imm32  <span class="Comment"># clear EBX</span>
+<span id="L64" class="LineNr"> 64 </span>  8a/copy                         0/mod/indirect  6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *ESI to lower byte of EBX</span>
+<span id="L65" class="LineNr"> 65 </span>    <span class="Comment"># if (c1 == 0) return false</span>
+<span id="L66" class="LineNr"> 66 </span>  3d/compare                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># compare EAX with 0</span>
+<span id="L67" class="LineNr"> 67 </span>  74/jump-if-equal  $argv_fail/disp8
+<span id="L68" class="LineNr"> 68 </span>    <span class="Comment"># if (c1 != c2) return false</span>
+<span id="L69" class="LineNr"> 69 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with EBX</span>
+<span id="L70" class="LineNr"> 70 </span>  75/jump-if-not-equal  $argv_fail/disp8
+<span id="L71" class="LineNr"> 71 </span>    <span class="Comment"># ++s1, ++s2, ++i</span>
+<span id="L72" class="LineNr"> 72 </span>  41/inc-ECX
+<span id="L73" class="LineNr"> 73 </span>  46/inc-ESI
+<span id="L74" class="LineNr"> 74 </span>  47/inc-EDI
+<span id="L75" class="LineNr"> 75 </span>  <span class="Comment"># end while</span>
+<span id="L76" class="LineNr"> 76 </span>  eb/jump  $argv_loop/disp8
+<span id="L77" class="LineNr"> 77 </span>$argv_break:
+<span id="L78" class="LineNr"> 78 </span>  <span class="Comment"># if (*s/EDI == 0) return true</span>
+<span id="L79" class="LineNr"> 79 </span>  b8/copy  0/imm32  <span class="Comment"># clear EAX</span>
+<span id="L80" class="LineNr"> 80 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDI to lower byte of EAX</span>
+<span id="L81" class="LineNr"> 81 </span>  81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># compare EAX with 0</span>
+<span id="L82" class="LineNr"> 82 </span>  75/jump-if-not-equal  $argv_fail/disp8
+<span id="L83" class="LineNr"> 83 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EAX</span>
+<span id="L84" class="LineNr"> 84 </span>  c3/return
+<span id="L85" class="LineNr"> 85 </span>  <span class="Comment"># return false</span>
+<span id="L86" class="LineNr"> 86 </span>$argv_fail:
+<span id="L87" class="LineNr"> 87 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy 0 to EAX</span>
+<span id="L88" class="LineNr"> 88 </span>  c3/return
+<span id="L89" class="LineNr"> 89 </span>
+<span id="L90" class="LineNr"> 90 </span><span class="SalientComment">## tests</span>
+<span id="L91" class="LineNr"> 91 </span>
+<span id="L92" class="LineNr"> 92 </span>test_compare_null_argv_with_empty_array:
+<span id="L93" class="LineNr"> 93 </span>  <span class="Comment"># EAX = argv_equal(Null_argv, &quot;&quot;)</span>
+<span id="L94" class="LineNr"> 94 </span>    <span class="Comment"># push args</span>
+<span id="L95" class="LineNr"> 95 </span>  68/push  Null_argv/imm32
+<span id="L96" class="LineNr"> 96 </span>  68/push  &quot;&quot;/imm32
+<span id="L97" class="LineNr"> 97 </span>    <span class="Comment"># call</span>
+<span id="L98" class="LineNr"> 98 </span>  e8/call  argv_equal/disp32
+<span id="L99" class="LineNr"> 99 </span>    <span class="Comment"># discard args</span>
+<span id="L100" class="LineNr">100 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add 8 to ESP</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Comment"># call check_ints_equal(EAX, 1)</span>
+<span id="L102" class="LineNr">102 </span>  50/push-EAX
+<span id="L103" class="LineNr">103 </span>  68/push  1/imm32/true
+<span id="L104" class="LineNr">104 </span>  68/push  &quot;F - test_compare_null_argv_with_empty_array&quot;/imm32
+<span id="L105" class="LineNr">105 </span>    <span class="Comment"># call</span>
+<span id="L106" class="LineNr">106 </span>  e8/call  check_ints_equal/disp32
+<span id="L107" class="LineNr">107 </span>    <span class="Comment"># discard args</span>
+<span id="L108" class="LineNr">108 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add 12 to ESP</span>
+<span id="L109" class="LineNr">109 </span>  c3/return
+<span id="L110" class="LineNr">110 </span>
+<span id="L111" class="LineNr">111 </span>test_compare_null_argv_with_non_empty_array:
+<span id="L112" class="LineNr">112 </span>  <span class="Comment"># EAX = argv_equal(Null_argv, &quot;Abc&quot;)</span>
+<span id="L113" class="LineNr">113 </span>    <span class="Comment"># push args</span>
+<span id="L114" class="LineNr">114 </span>  68/push  Null_argv/imm32
+<span id="L115" class="LineNr">115 </span>  68/push  &quot;Abc&quot;/imm32
+<span id="L116" class="LineNr">116 </span>    <span class="Comment"># call</span>
+<span id="L117" class="LineNr">117 </span>  e8/call  argv_equal/disp32
+<span id="L118" class="LineNr">118 </span>    <span class="Comment"># discard args</span>
+<span id="L119" class="LineNr">119 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add 8 to ESP</span>
+<span id="L120" class="LineNr">120 </span>  <span class="Comment"># call check_ints_equal(EAX, 0)</span>
+<span id="L121" class="LineNr">121 </span>  50/push-EAX
+<span id="L122" class="LineNr">122 </span>  68/push  0/imm32/false
+<span id="L123" class="LineNr">123 </span>  68/push  &quot;F - test_compare_null_argv_with_non_empty_array&quot;/imm32
+<span id="L124" class="LineNr">124 </span>    <span class="Comment"># call</span>
+<span id="L125" class="LineNr">125 </span>  e8/call  check_ints_equal/disp32
+<span id="L126" class="LineNr">126 </span>    <span class="Comment"># discard args</span>
+<span id="L127" class="LineNr">127 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add 12 to ESP</span>
+<span id="L128" class="LineNr">128 </span>  c3/return
+<span id="L129" class="LineNr">129 </span>
+<span id="L130" class="LineNr">130 </span>test_compare_argv_with_equal_array:
+<span id="L131" class="LineNr">131 </span>  <span class="Comment"># EAX = argv_equal(Abc_argv, &quot;Abc&quot;)</span>
+<span id="L132" class="LineNr">132 </span>    <span class="Comment"># push args</span>
+<span id="L133" class="LineNr">133 </span>  68/push  Abc_argv/imm32
+<span id="L134" class="LineNr">134 </span>  68/push  &quot;Abc&quot;/imm32
+<span id="L135" class="LineNr">135 </span>    <span class="Comment"># call</span>
+<span id="L136" class="LineNr">136 </span>  e8/call  argv_equal/disp32
+<span id="L137" class="LineNr">137 </span>    <span class="Comment"># discard args</span>
+<span id="L138" class="LineNr">138 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add 8 to ESP</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Comment"># call check_ints_equal(EAX, 1)</span>
+<span id="L140" class="LineNr">140 </span>  50/push-EAX
+<span id="L141" class="LineNr">141 </span>  68/push  1/imm32/true
+<span id="L142" class="LineNr">142 </span>  68/push  &quot;F - test_compare_argv_with_equal_array&quot;/imm32
+<span id="L143" class="LineNr">143 </span>    <span class="Comment"># call</span>
+<span id="L144" class="LineNr">144 </span>  e8/call  check_ints_equal/disp32
+<span id="L145" class="LineNr">145 </span>    <span class="Comment"># discard args</span>
+<span id="L146" class="LineNr">146 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add 12 to ESP</span>
+<span id="L147" class="LineNr">147 </span>  c3/return
+<span id="L148" class="LineNr">148 </span>
+<span id="L149" class="LineNr">149 </span>test_compare_argv_with_inequal_array:
+<span id="L150" class="LineNr">150 </span>  <span class="Comment"># EAX = argv_equal(Abc_argv, &quot;Adc&quot;)</span>
+<span id="L151" class="LineNr">151 </span>    <span class="Comment"># push args</span>
+<span id="L152" class="LineNr">152 </span>  68/push  Abc_argv/imm32
+<span id="L153" class="LineNr">153 </span>  68/push  &quot;Adc&quot;/imm32
+<span id="L154" class="LineNr">154 </span>    <span class="Comment"># call</span>
+<span id="L155" class="LineNr">155 </span>  e8/call  argv_equal/disp32
+<span id="L156" class="LineNr">156 </span>    <span class="Comment"># discard args</span>
+<span id="L157" class="LineNr">157 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add 8 to ESP</span>
+<span id="L158" class="LineNr">158 </span>  <span class="Comment"># call check_ints_equal(EAX, 0)</span>
+<span id="L159" class="LineNr">159 </span>  50/push-EAX
+<span id="L160" class="LineNr">160 </span>  68/push  0/imm32/false
+<span id="L161" class="LineNr">161 </span>  68/push  &quot;F - test_compare_argv_with_equal_array&quot;/imm32
+<span id="L162" class="LineNr">162 </span>    <span class="Comment"># call</span>
+<span id="L163" class="LineNr">163 </span>  e8/call  check_ints_equal/disp32
+<span id="L164" class="LineNr">164 </span>    <span class="Comment"># discard args</span>
+<span id="L165" class="LineNr">165 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add 12 to ESP</span>
+<span id="L166" class="LineNr">166 </span>  c3/return
+<span id="L167" class="LineNr">167 </span>
+<span id="L168" class="LineNr">168 </span>test_compare_argv_with_empty_array:
+<span id="L169" class="LineNr">169 </span>  <span class="Comment"># EAX = argv_equal(Abc_argv, &quot;&quot;)</span>
+<span id="L170" class="LineNr">170 </span>    <span class="Comment"># push args</span>
+<span id="L171" class="LineNr">171 </span>  68/push  Abc_argv/imm32
+<span id="L172" class="LineNr">172 </span>  68/push  &quot;&quot;/imm32
+<span id="L173" class="LineNr">173 </span>    <span class="Comment"># call</span>
+<span id="L174" class="LineNr">174 </span>  e8/call  argv_equal/disp32
+<span id="L175" class="LineNr">175 </span>    <span class="Comment"># discard args</span>
+<span id="L176" class="LineNr">176 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add 8 to ESP</span>
+<span id="L177" class="LineNr">177 </span>  <span class="Comment"># call check_ints_equal(EAX, 0)</span>
+<span id="L178" class="LineNr">178 </span>  50/push-EAX
+<span id="L179" class="LineNr">179 </span>  68/push  0/imm32/false
+<span id="L180" class="LineNr">180 </span>  68/push  &quot;F - test_compare_argv_with_equal_array&quot;/imm32
+<span id="L181" class="LineNr">181 </span>    <span class="Comment"># call</span>
+<span id="L182" class="LineNr">182 </span>  e8/call  check_ints_equal/disp32
+<span id="L183" class="LineNr">183 </span>    <span class="Comment"># discard args</span>
+<span id="L184" class="LineNr">184 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add 12 to ESP</span>
+<span id="L185" class="LineNr">185 </span>  c3/return
+<span id="L186" class="LineNr">186 </span>
+<span id="L187" class="LineNr">187 </span>test_compare_argv_with_shorter_array:
+<span id="L188" class="LineNr">188 </span>  <span class="Comment"># EAX = argv_equal(Abc_argv, &quot;Ab&quot;)</span>
+<span id="L189" class="LineNr">189 </span>    <span class="Comment"># push args</span>
+<span id="L190" class="LineNr">190 </span>  68/push  Abc_argv/imm32
+<span id="L191" class="LineNr">191 </span>  68/push  &quot;Ab&quot;/imm32
+<span id="L192" class="LineNr">192 </span>    <span class="Comment"># call</span>
+<span id="L193" class="LineNr">193 </span>  e8/call  argv_equal/disp32
+<span id="L194" class="LineNr">194 </span>    <span class="Comment"># discard args</span>
+<span id="L195" class="LineNr">195 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add 8 to ESP</span>
+<span id="L196" class="LineNr">196 </span>  <span class="Comment"># call check_ints_equal(EAX, 0)</span>
+<span id="L197" class="LineNr">197 </span>  50/push-EAX
+<span id="L198" class="LineNr">198 </span>  68/push  0/imm32/false
+<span id="L199" class="LineNr">199 </span>  68/push  &quot;F - test_compare_argv_with_shorter_array&quot;/imm32
+<span id="L200" class="LineNr">200 </span>    <span class="Comment"># call</span>
+<span id="L201" class="LineNr">201 </span>  e8/call  check_ints_equal/disp32
+<span id="L202" class="LineNr">202 </span>    <span class="Comment"># discard args</span>
+<span id="L203" class="LineNr">203 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add 12 to ESP</span>
+<span id="L204" class="LineNr">204 </span>  c3/return
+<span id="L205" class="LineNr">205 </span>
+<span id="L206" class="LineNr">206 </span>test_compare_argv_with_longer_array:
+<span id="L207" class="LineNr">207 </span>  <span class="Comment"># EAX = argv_equal(Abc_argv, &quot;Abcd&quot;)</span>
+<span id="L208" class="LineNr">208 </span>    <span class="Comment"># push args</span>
+<span id="L209" class="LineNr">209 </span>  68/push  Abc_argv/imm32
+<span id="L210" class="LineNr">210 </span>  68/push  &quot;Abcd&quot;/imm32
+<span id="L211" class="LineNr">211 </span>    <span class="Comment"># call</span>
+<span id="L212" class="LineNr">212 </span>  e8/call  argv_equal/disp32
+<span id="L213" class="LineNr">213 </span>    <span class="Comment"># discard args</span>
+<span id="L214" class="LineNr">214 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add 8 to ESP</span>
+<span id="L215" class="LineNr">215 </span>  <span class="Comment"># call check_ints_equal(EAX, 0)</span>
+<span id="L216" class="LineNr">216 </span>  50/push-EAX
+<span id="L217" class="LineNr">217 </span>  68/push  0/imm32/false
+<span id="L218" class="LineNr">218 </span>  68/push  &quot;F - test_compare_argv_with_longer_array&quot;/imm32
+<span id="L219" class="LineNr">219 </span>    <span class="Comment"># call</span>
+<span id="L220" class="LineNr">220 </span>  e8/call  check_ints_equal/disp32
+<span id="L221" class="LineNr">221 </span>    <span class="Comment"># discard args</span>
+<span id="L222" class="LineNr">222 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add 12 to ESP</span>
+<span id="L223" class="LineNr">223 </span>  c3/return
+<span id="L224" class="LineNr">224 </span>
+<span id="L225" class="LineNr">225 </span><span class="SalientComment">## helpers</span>
+<span id="L226" class="LineNr">226 </span>
+<span id="L227" class="LineNr">227 </span><span class="Comment"># print msg to stderr if a != b, otherwise print &quot;.&quot;</span>
+<span id="L228" class="LineNr">228 </span>check_ints_equal:  <span class="Comment"># (a : int, b : int, msg : (address array byte)) -&gt; boolean</span>
+<span id="L229" class="LineNr">229 </span>  <span class="Comment"># load args into EAX, EBX and ECX</span>
+<span id="L230" class="LineNr">230 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+12) to EAX</span>
+<span id="L231" class="LineNr">231 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+8) to EBX</span>
+<span id="L232" class="LineNr">232 </span>  <span class="Comment"># if EAX == b/EBX</span>
+<span id="L233" class="LineNr">233 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX and EBX</span>
+<span id="L234" class="LineNr">234 </span>  75/jump-if-unequal  $check_ints_equal:else/disp8
+<span id="L235" class="LineNr">235 </span>    <span class="Comment"># print('.')</span>
+<span id="L236" class="LineNr">236 </span>      <span class="Comment"># push args</span>
+<span id="L237" class="LineNr">237 </span>  68/push  &quot;.&quot;/imm32
+<span id="L238" class="LineNr">238 </span>      <span class="Comment"># call</span>
+<span id="L239" class="LineNr">239 </span>  e8/call  write_stderr/disp32
+<span id="L240" class="LineNr">240 </span>      <span class="Comment"># discard arg</span>
+<span id="L241" class="LineNr">241 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L242" class="LineNr">242 </span>    <span class="Comment"># return</span>
+<span id="L243" class="LineNr">243 </span>  c3/return
+<span id="L244" class="LineNr">244 </span>  <span class="Comment"># else:</span>
+<span id="L245" class="LineNr">245 </span>$check_ints_equal:else:
+<span id="L246" class="LineNr">246 </span>  <span class="Comment"># copy msg into ECX</span>
+<span id="L247" class="LineNr">247 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to ECX</span>
+<span id="L248" class="LineNr">248 </span>    <span class="Comment"># print(ECX)</span>
+<span id="L249" class="LineNr">249 </span>      <span class="Comment"># push args</span>
+<span id="L250" class="LineNr">250 </span>  51/push-ECX
+<span id="L251" class="LineNr">251 </span>      <span class="Comment"># call</span>
+<span id="L252" class="LineNr">252 </span>  e8/call  write_stderr/disp32
+<span id="L253" class="LineNr">253 </span>      <span class="Comment"># discard arg</span>
+<span id="L254" class="LineNr">254 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L255" class="LineNr">255 </span>    <span class="Comment"># print newline</span>
+<span id="L256" class="LineNr">256 </span>      <span class="Comment"># push args</span>
+<span id="L257" class="LineNr">257 </span>  68/push  Newline/imm32
+<span id="L258" class="LineNr">258 </span>      <span class="Comment"># call</span>
+<span id="L259" class="LineNr">259 </span>  e8/call  write_stderr/disp32
+<span id="L260" class="LineNr">260 </span>      <span class="Comment"># discard arg</span>
+<span id="L261" class="LineNr">261 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ESP</span>
+<span id="L262" class="LineNr">262 </span>  <span class="Comment"># end</span>
+<span id="L263" class="LineNr">263 </span>  c3/return
+<span id="L264" class="LineNr">264 </span>
+<span id="L265" class="LineNr">265 </span>write_stderr:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L266" class="LineNr">266 </span>  <span class="Comment"># save registers</span>
+<span id="L267" class="LineNr">267 </span>  50/push-EAX
+<span id="L268" class="LineNr">268 </span>  51/push-ECX
+<span id="L269" class="LineNr">269 </span>  52/push-EDX
+<span id="L270" class="LineNr">270 </span>  53/push-EBX
+<span id="L271" class="LineNr">271 </span>  <span class="Comment"># write(2/stderr, (data) s+4, (size) *s)</span>
+<span id="L272" class="LineNr">272 </span>    <span class="Comment"># fd = 2 (stderr)</span>
+<span id="L273" class="LineNr">273 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              2/imm32           <span class="Comment"># copy 2 to EBX</span>
+<span id="L274" class="LineNr">274 </span>    <span class="Comment"># x = s+4</span>
+<span id="L275" class="LineNr">275 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+20) to ECX</span>
+<span id="L276" class="LineNr">276 </span>  81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add 4 to ECX</span>
+<span id="L277" class="LineNr">277 </span>    <span class="Comment"># size = *s</span>
+<span id="L278" class="LineNr">278 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+20) to EDX</span>
+<span id="L279" class="LineNr">279 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
+<span id="L280" class="LineNr">280 </span>    <span class="Comment"># call write()</span>
+<span id="L281" class="LineNr">281 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write     <span class="Comment"># copy 1 to EAX</span>
+<span id="L282" class="LineNr">282 </span>  cd/syscall  0x80/imm8
+<span id="L283" class="LineNr">283 </span>  <span class="Comment"># restore registers</span>
+<span id="L284" class="LineNr">284 </span>  5b/pop-EBX
+<span id="L285" class="LineNr">285 </span>  5a/pop-EDX
+<span id="L286" class="LineNr">286 </span>  59/pop-ECX
+<span id="L287" class="LineNr">287 </span>  58/pop-EAX
+<span id="L288" class="LineNr">288 </span>  <span class="Comment"># end</span>
+<span id="L289" class="LineNr">289 </span>  c3/return
+<span id="L290" class="LineNr">290 </span>
+<span id="L291" class="LineNr">291 </span>== data
+<span id="L292" class="LineNr">292 </span>Newline:
+<span id="L293" class="LineNr">293 </span>  <span class="Comment"># size</span>
+<span id="L294" class="LineNr">294 </span>  01 00 00 00
+<span id="L295" class="LineNr">295 </span>  <span class="Comment"># data</span>
+<span id="L296" class="LineNr">296 </span>  0a/newline
+<span id="L297" class="LineNr">297 </span>
+<span id="L298" class="LineNr">298 </span><span class="Comment"># for argv_equal tests</span>
+<span id="L299" class="LineNr">299 </span>Null_argv:
+<span id="L300" class="LineNr">300 </span>  00/null
+<span id="L301" class="LineNr">301 </span>Abc_argv:
+<span id="L302" class="LineNr">302 </span>  41/A 62/b 63/c 00/null
+<span id="L303" class="LineNr">303 </span>
+<span id="L304" class="LineNr">304 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:so=0</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/examples/ex5.subx.html b/html/subx/examples/ex5.subx.html
index aa4f9761..7bd76e98 100644
--- a/html/subx/examples/ex5.subx.html
+++ b/html/subx/examples/ex5.subx.html
@@ -16,6 +16,7 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .LineNr { color: #444444; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .SalientComment { color: #00ffff; }
@@ -65,39 +66,36 @@ if ('onhashchange' in window) {
 <span id="L10" class="LineNr">10 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L11" class="LineNr">11 </span>
 <span id="L12" class="LineNr">12 </span><span class="Comment"># main:</span>
-<span id="L13" class="LineNr">13 </span>  <span class="Comment"># prolog</span>
-<span id="L14" class="LineNr">14 </span>  55/push                                                                                                                                           <span class="Comment"># push EBP</span>
-<span id="L15" class="LineNr">15 </span>  89/copy                         3/mod/direct    5/rm32/EBP                                          4/r32/ESP                                     <span class="Comment"># copy ESP to EBP</span>
-<span id="L16" class="LineNr">16 </span>  <span class="Comment"># allocate x on the stack</span>
-<span id="L17" class="LineNr">17 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP                                                                      4/imm32           <span class="Comment"># subtract 4 bytes from ESP</span>
-<span id="L18" class="LineNr">18 </span>
-<span id="L19" class="LineNr">19 </span>  <span class="Comment"># read(stdin, x, 1)</span>
-<span id="L20" class="LineNr">20 </span>    <span class="Comment"># fd = 0 (stdin)</span>
-<span id="L21" class="LineNr">21 </span>  bb/copy                                                                                                                         0/imm32           <span class="Comment"># copy 0 to EBX</span>
-<span id="L22" class="LineNr">22 </span>    <span class="Comment"># initialize x (location to write result to)</span>
-<span id="L23" class="LineNr">23 </span>  89/copy                         3/mod/direct    1/rm32/ECX                                          5/r32/EBP                                     <span class="Comment"># copy EBP to ECX</span>
-<span id="L24" class="LineNr">24 </span>    <span class="Comment"># size = 1 character</span>
-<span id="L25" class="LineNr">25 </span>  ba/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EDX</span>
-<span id="L26" class="LineNr">26 </span>    <span class="Comment"># read(fd, x, size)</span>
-<span id="L27" class="LineNr">27 </span>  b8/copy                                                                                                                         3/imm32/read      <span class="Comment"># copy 3 to EAX</span>
-<span id="L28" class="LineNr">28 </span>  cd/syscall  0x80/imm8
-<span id="L29" class="LineNr">29 </span>
-<span id="L30" class="LineNr">30 </span>  <span class="Comment"># write(stdout, x, 1)</span>
-<span id="L31" class="LineNr">31 </span>    <span class="Comment"># fd = 1 (stdout)</span>
-<span id="L32" class="LineNr">32 </span>  bb/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EBX</span>
-<span id="L33" class="LineNr">33 </span>    <span class="Comment"># initialize x (location to read from)</span>
-<span id="L34" class="LineNr">34 </span>  89/copy                         3/mod/direct    1/rm32/ECX                                          5/r32/EBP                                     <span class="Comment"># copy EBP to ECX</span>
-<span id="L35" class="LineNr">35 </span>    <span class="Comment"># size = 1 character</span>
-<span id="L36" class="LineNr">36 </span>  ba/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EDX</span>
-<span id="L37" class="LineNr">37 </span>    <span class="Comment"># write(fd, x, size)</span>
-<span id="L38" class="LineNr">38 </span>  b8/copy                                                                                                                         4/imm32/write     <span class="Comment"># copy 4 to EAX</span>
-<span id="L39" class="LineNr">39 </span>  cd/syscall  0x80/imm8
-<span id="L40" class="LineNr">40 </span>
-<span id="L41" class="LineNr">41 </span>  <span class="Comment"># exit(EBX)</span>
-<span id="L42" class="LineNr">42 </span>  b8/copy                                                                                                                         1/imm32/exit      <span class="Comment"># copy 1 to EAX</span>
-<span id="L43" class="LineNr">43 </span>  cd/syscall  0x80/imm8
-<span id="L44" class="LineNr">44 </span>
-<span id="L45" class="LineNr">45 </span><span class="Comment"># vim&#0058;ft=subx:nowrap</span>
+<span id="L13" class="LineNr">13 </span>  <span class="Comment"># allocate x on the stack</span>
+<span id="L14" class="LineNr">14 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># subtract 4 bytes from ESP</span>
+<span id="L15" class="LineNr">15 </span>
+<span id="L16" class="LineNr">16 </span>  <span class="Comment"># read(stdin, x, 1)</span>
+<span id="L17" class="LineNr">17 </span>    <span class="Comment"># fd = 0 (stdin)</span>
+<span id="L18" class="LineNr">18 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy 0 to EBX</span>
+<span id="L19" class="LineNr">19 </span>    <span class="Comment"># initialize x (location to write result to)</span>
+<span id="L20" class="LineNr">20 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP+4 to ECX</span>
+<span id="L21" class="LineNr">21 </span>    <span class="Comment"># size = 1 character</span>
+<span id="L22" class="LineNr">22 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EDX</span>
+<span id="L23" class="LineNr">23 </span>    <span class="Comment"># read(fd, x, size)</span>
+<span id="L24" class="LineNr">24 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              3/imm32/read      <span class="Comment"># copy 3 to EAX</span>
+<span id="L25" class="LineNr">25 </span>  cd/syscall  0x80/imm8
+<span id="L26" class="LineNr">26 </span>
+<span id="L27" class="LineNr">27 </span>  <span class="Comment"># write(stdout, x, 1)</span>
+<span id="L28" class="LineNr">28 </span>    <span class="Comment"># fd = 1 (stdout)</span>
+<span id="L29" class="LineNr">29 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EBX</span>
+<span id="L30" class="LineNr">30 </span>    <span class="Comment"># initialize x (location to read from)</span>
+<span id="L31" class="LineNr">31 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP+4 to ECX</span>
+<span id="L32" class="LineNr">32 </span>    <span class="Comment"># size = 1 character</span>
+<span id="L33" class="LineNr">33 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EDX</span>
+<span id="L34" class="LineNr">34 </span>    <span class="Comment"># write(fd, x, size)</span>
+<span id="L35" class="LineNr">35 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write     <span class="Comment"># copy 4 to EAX</span>
+<span id="L36" class="LineNr">36 </span>  cd/syscall  0x80/imm8
+<span id="L37" class="LineNr">37 </span>
+<span id="L38" class="LineNr">38 </span>  <span class="Comment"># exit(EBX)</span>
+<span id="L39" class="LineNr">39 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit      <span class="Comment"># copy 1 to EAX</span>
+<span id="L40" class="LineNr">40 </span>  cd/syscall  0x80/imm8
+<span id="L41" class="LineNr">41 </span>
+<span id="L42" class="LineNr">42 </span><span class="Comment"># vim&#0058;ft=subx:nowrap</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex8.subx.html b/html/subx/examples/ex8.subx.html
index e091fe9b..65f5e09c 100644
--- a/html/subx/examples/ex8.subx.html
+++ b/html/subx/examples/ex8.subx.html
@@ -77,44 +77,38 @@ if ('onhashchange' in window) {
 <span id="L21" class="LineNr">21 </span>  <span class="Comment"># var s = argv[1] (EBX)</span>
 <span id="L22" class="LineNr">22 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              3/r32/EBX   8/disp8        <span class="Delimiter"> . </span>                      <span class="Comment"># copy *(ESP+8) to EBX</span>
 <span id="L23" class="LineNr">23 </span>  <span class="Comment"># call ascii_length(EBX)</span>
-<span id="L24" class="LineNr">24 </span>    <span class="Comment"># prepare call</span>
-<span id="L25" class="LineNr">25 </span>  55/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># push EBP</span>
-<span id="L26" class="LineNr">26 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy ESP to EBP</span>
-<span id="L27" class="LineNr">27 </span>    <span class="Comment"># push args</span>
-<span id="L28" class="LineNr">28 </span>  53/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># push EBX</span>
-<span id="L29" class="LineNr">29 </span>    <span class="Comment"># call</span>
-<span id="L30" class="LineNr">30 </span>  e8/call  ascii_length/disp32
-<span id="L31" class="LineNr">31 </span>    <span class="Comment"># discard args</span>
-<span id="L32" class="LineNr">32 </span>  5a/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># pop into EDX</span>
-<span id="L33" class="LineNr">33 </span>    <span class="Comment"># clean up after call</span>
-<span id="L34" class="LineNr">34 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy EBP to ESP</span>
-<span id="L35" class="LineNr">35 </span>  5d/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># pop to EBP</span>
-<span id="L36" class="LineNr">36 </span>
-<span id="L37" class="LineNr">37 </span>  <span class="Comment"># exit(EAX)</span>
-<span id="L38" class="LineNr">38 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy EAX to EBX</span>
-<span id="L39" class="LineNr">39 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit            <span class="Comment"># copy 1 to EAX</span>
-<span id="L40" class="LineNr">40 </span>  cd/syscall  0x80/imm8
-<span id="L41" class="LineNr">41 </span>
-<span id="L42" class="LineNr">42 </span>ascii_length:  <span class="Comment"># (s)</span>
-<span id="L43" class="LineNr">43 </span>  <span class="Comment"># initialize s (EDX)</span>
-<span id="L44" class="LineNr">44 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              2/r32/EDX   4/disp8                                 <span class="Comment"># copy *(ESP+4) to EDX</span>
-<span id="L45" class="LineNr">45 </span>  <span class="Comment"># var result = 0 (EAX)</span>
-<span id="L46" class="LineNr">46 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32                 <span class="Comment"># copy 0 to EAX</span>
-<span id="L47" class="LineNr">47 </span>$ascii_length_loop:
-<span id="L48" class="LineNr">48 </span>  <span class="Comment"># var c = *s (ECX)</span>
-<span id="L49" class="LineNr">49 </span>  8a/copy                         0/mod/*         2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy byte at *EDX to lower byte of ECX</span>
-<span id="L50" class="LineNr">50 </span>  <span class="Comment"># if c == '\0' break</span>
-<span id="L51" class="LineNr">51 </span>  81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32                 <span class="Comment"># compare ECX with 0</span>
-<span id="L52" class="LineNr">52 </span>  74/jump-if-equal  $ascii_length_ret/disp8
-<span id="L53" class="LineNr">53 </span>  <span class="Comment"># ++s</span>
-<span id="L54" class="LineNr">54 </span>  81          0/subop/add         3/mod/direct    2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32                 <span class="Comment"># add 1 to EDX</span>
-<span id="L55" class="LineNr">55 </span>  <span class="Comment"># ++result</span>
-<span id="L56" class="LineNr">56 </span>  81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32                 <span class="Comment"># add 1 to EAX</span>
-<span id="L57" class="LineNr">57 </span>  <span class="Comment"># loop</span>
-<span id="L58" class="LineNr">58 </span>  eb/jump  $ascii_length_loop/disp8
-<span id="L59" class="LineNr">59 </span>$ascii_length_ret:
-<span id="L60" class="LineNr">60 </span>  <span class="Comment"># return (result in EAX)</span>
-<span id="L61" class="LineNr">61 </span>  c3/return
+<span id="L24" class="LineNr">24 </span>    <span class="Comment"># push args</span>
+<span id="L25" class="LineNr">25 </span>  53/push-EBX
+<span id="L26" class="LineNr">26 </span>    <span class="Comment"># call</span>
+<span id="L27" class="LineNr">27 </span>  e8/call  ascii_length/disp32
+<span id="L28" class="LineNr">28 </span>    <span class="Comment"># discard args</span>
+<span id="L29" class="LineNr">29 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32                 <span class="Comment"># add 4 to ESP</span>
+<span id="L30" class="LineNr">30 </span>
+<span id="L31" class="LineNr">31 </span>  <span class="Comment"># exit(EAX)</span>
+<span id="L32" class="LineNr">32 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy EAX to EBX</span>
+<span id="L33" class="LineNr">33 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit            <span class="Comment"># copy 1 to EAX</span>
+<span id="L34" class="LineNr">34 </span>  cd/syscall  0x80/imm8
+<span id="L35" class="LineNr">35 </span>
+<span id="L36" class="LineNr">36 </span>ascii_length:  <span class="Comment"># (s)</span>
+<span id="L37" class="LineNr">37 </span>  <span class="Comment"># initialize s (EDX)</span>
+<span id="L38" class="LineNr">38 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              2/r32/EDX   4/disp8                                 <span class="Comment"># copy *(ESP+4) to EDX</span>
+<span id="L39" class="LineNr">39 </span>  <span class="Comment"># var result = 0 (EAX)</span>
+<span id="L40" class="LineNr">40 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32                 <span class="Comment"># copy 0 to EAX</span>
+<span id="L41" class="LineNr">41 </span>$ascii_length_loop:
+<span id="L42" class="LineNr">42 </span>  <span class="Comment"># var c = *s (ECX)</span>
+<span id="L43" class="LineNr">43 </span>  8a/copy                         0/mod/*         2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy byte at *EDX to lower byte of ECX</span>
+<span id="L44" class="LineNr">44 </span>  <span class="Comment"># if c == '\0' break</span>
+<span id="L45" class="LineNr">45 </span>  81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32                 <span class="Comment"># compare ECX with 0</span>
+<span id="L46" class="LineNr">46 </span>  74/jump-if-equal  $ascii_length_ret/disp8
+<span id="L47" class="LineNr">47 </span>  <span class="Comment"># ++s</span>
+<span id="L48" class="LineNr">48 </span>  81          0/subop/add         3/mod/direct    2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32                 <span class="Comment"># add 1 to EDX</span>
+<span id="L49" class="LineNr">49 </span>  <span class="Comment"># ++result</span>
+<span id="L50" class="LineNr">50 </span>  81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32                 <span class="Comment"># add 1 to EAX</span>
+<span id="L51" class="LineNr">51 </span>  <span class="Comment"># loop</span>
+<span id="L52" class="LineNr">52 </span>  eb/jump  $ascii_length_loop/disp8
+<span id="L53" class="LineNr">53 </span>$ascii_length_ret:
+<span id="L54" class="LineNr">54 </span>  <span class="Comment"># return (result in EAX)</span>
+<span id="L55" class="LineNr">55 </span>  c3/return
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex9.subx.html b/html/subx/examples/ex9.subx.html
index 6665f520..78d8323e 100644
--- a/html/subx/examples/ex9.subx.html
+++ b/html/subx/examples/ex9.subx.html
@@ -82,8 +82,8 @@ if ('onhashchange' in window) {
 <span id="L26" class="LineNr">26 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+12) to EBX</span>
 <span id="L27" class="LineNr">27 </span>  <span class="Comment"># call string_equal(s1, s2)</span>
 <span id="L28" class="LineNr">28 </span>    <span class="Comment"># push args</span>
-<span id="L29" class="LineNr">29 </span>  50/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EAX</span>
-<span id="L30" class="LineNr">30 </span>  53/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EBX</span>
+<span id="L29" class="LineNr">29 </span>  50/push-EAX
+<span id="L30" class="LineNr">30 </span>  53/push-EBX
 <span id="L31" class="LineNr">31 </span>    <span class="Comment"># call</span>
 <span id="L32" class="LineNr">32 </span>  e8/call  ascii_difference/disp32
 <span id="L33" class="LineNr">33 </span>    <span class="Comment"># discard args</span>
@@ -95,7 +95,7 @@ if ('onhashchange' in window) {
 <span id="L39" class="LineNr">39 </span>
 <span id="L40" class="LineNr">40 </span>ascii_difference:  <span class="Comment"># (s1, s2) : null-terminated ascii strings</span>
 <span id="L41" class="LineNr">41 </span>  <span class="Comment"># a = first letter of s1 (ECX)</span>
-<span id="L42" class="LineNr">42 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              0/r32/EAX   8/disp8                           <span class="Comment"># copy *(ESP+8) to EAX</span>
+<span id="L42" class="LineNr">42 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+8) to EAX</span>
 <span id="L43" class="LineNr">43 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EAX to EAX</span>
 <span id="L44" class="LineNr">44 </span>  <span class="Comment"># b = first letter of s2 (EDX)</span>
 <span id="L45" class="LineNr">45 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   4/disp8                           <span class="Comment"># copy *(ESP+4) to ECX</span>