4478

author: Kartik Agaram <vc@akkartik.com> 2018-08-04 17:00:27 -0700
committer: Kartik Agaram <vc@akkartik.com> 2018-08-04 17:00:27 -0700
commit: bb2b6ba7fd72bbebc3a4490d090f080e7b8628cc (patch)
tree: 2a8e0697887f3028b3b9042b62fa57064537bd87
parent: 6cabcefe67d2cd0583b556129fe3d8c89cf0fcb8 (diff)
download: mu-bb2b6ba7fd72bbebc3a4490d090f080e7b8628cc.tar.gz
40 files changed, 3421 insertions, 4727 deletions
diff --git a/html/subx/001help.cc.html b/html/subx/001help.cc.html
index 03a2160c..e76d8212 100644
--- a/html/subx/001help.cc.html
+++ b/html/subx/001help.cc.html
@@ -120,8 +120,8 @@ if ('onhashchange' in window) {
 <span id="L59" class="LineNr"> 59 </span><span class="Delimiter">:(code)</span>
 <span id="L60" class="LineNr"> 60 </span><span class="Normal">void</span> <a href='001help.cc.html#L60'>init_help</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L61" class="LineNr"> 61 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;usage&quot;</span><span class="Delimiter">,</span>
-<span id="L62" class="LineNr"> 62 </span>    <span class="Constant">&quot;Welcome to SubX, a better way to <a href='011run.cc.html#L94'>program</a> in machine code.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L63" class="LineNr"> 63 </span>    <span class="Constant">&quot;SubX uses a subset of the x86 instruction set. SubX programs will <a href='011run.cc.html#L78'>run</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L62" class="LineNr"> 62 </span>    <span class="Constant">&quot;Welcome to SubX, a better way to <a href='011run.cc.html#L96'>program</a> in machine code.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L63" class="LineNr"> 63 </span>    <span class="Constant">&quot;SubX uses a subset of the x86 instruction set. SubX programs will <a href='011run.cc.html#L80'>run</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L64" class="LineNr"> 64 </span>    <span class="Constant">&quot;without modification on Linux computers.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L65" class="LineNr"> 65 </span>    <span class="Constant">&quot;It provides a better experience and better error messages than</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L66" class="LineNr"> 66 </span>    <span class="Constant">&quot;programming directly in machine code, but you have to stick to the</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
@@ -132,15 +132,15 @@ if ('onhashchange' in window) {
 <span id="L71" class="LineNr"> 71 </span>    <span class="Constant">&quot;    subx test</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L72" class="LineNr"> 72 </span>    <span class="Constant">&quot;- See this message:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L73" class="LineNr"> 73 </span>    <span class="Constant">&quot;    subx --help</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L74" class="LineNr"> 74 </span>    <span class="Constant">&quot;- Convert a textual SubX <a href='011run.cc.html#L94'>program</a> into a standard ELF binary that you can</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L75" class="LineNr"> 75 </span>    <span class="Constant">&quot;  <a href='011run.cc.html#L78'>run</a> on your computer:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L74" class="LineNr"> 74 </span>    <span class="Constant">&quot;- Convert a textual SubX <a href='011run.cc.html#L96'>program</a> into a standard ELF binary that you can</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L75" class="LineNr"> 75 </span>    <span class="Constant">&quot;  <a href='011run.cc.html#L80'>run</a> on your computer:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L76" class="LineNr"> 76 </span>    <span class="Constant">&quot;    subx translate &lt;input 'source' file&gt; &lt;output ELF binary&gt;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L77" class="LineNr"> 77 </span>    <span class="Constant">&quot;- Run a SubX binary using SubX itself (for better error messages):</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L78" class="LineNr"> 78 </span>    <span class="Constant">&quot;    subx <a href='011run.cc.html#L78'>run</a> &lt;ELF binary&gt;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L79" class="LineNr"> 79 </span>    <span class="Constant">&quot;Add '--trace' to any of these commands to also emit a <a href='003trace.cc.html#L189'>trace</a>, for debugging purposes.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L78" class="LineNr"> 78 </span>    <span class="Constant">&quot;    subx <a href='011run.cc.html#L80'>run</a> &lt;ELF binary&gt;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L79" class="LineNr"> 79 </span>    <span class="Constant">&quot;Add '--trace' to any of these commands to also emit a <a href='003trace.cc.html#L190'>trace</a>, for debugging purposes.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L80" class="LineNr"> 80 </span>    <span class="Constant">&quot;However, options starting with '--' must always come before any other arguments.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L81" class="LineNr"> 81 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L82" class="LineNr"> 82 </span>    <span class="Constant">&quot;To <a href='011run.cc.html#L103'>start</a> learning how to write SubX programs, <a href='011run.cc.html#L78'>run</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L82" class="LineNr"> 82 </span>    <span class="Constant">&quot;To <a href='011run.cc.html#L105'>start</a> learning how to write SubX programs, <a href='011run.cc.html#L80'>run</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L83" class="LineNr"> 83 </span>    <span class="Constant">&quot;  subx help</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L84" class="LineNr"> 84 </span>  <span class="Delimiter">);</span>
 <span id="L85" class="LineNr"> 85 </span>  <span class="Comment">// End Help Texts</span>
@@ -153,9 +153,9 @@ if ('onhashchange' in window) {
 <span id="L92" class="LineNr"> 92 </span>
 <span id="L93" class="LineNr"> 93 </span><span class="Normal">bool</span> <a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; pat<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L94" class="LineNr"> 94 </span>  string::const_iterator a=s<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> b=pat<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  a!=s<span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">()</span> &amp;&amp; b!=pat<span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>  ++a<span class="Delimiter">,</span> ++b<span class="Delimiter">)</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  a!=s<span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">()</span> &amp;&amp; b!=pat<span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>  ++a<span class="Delimiter">,</span> ++b<span class="Delimiter">)</span>
 <span id="L96" class="LineNr"> 96 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>*a != *b<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L97" class="LineNr"> 97 </span>  <span class="Identifier">return</span> b == pat<span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L97" class="LineNr"> 97 </span>  <span class="Identifier">return</span> b == pat<span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L98" class="LineNr"> 98 </span><span class="Delimiter">}</span>
 <span id="L99" class="LineNr"> 99 </span>
 <span id="L100" class="LineNr">100 </span><span class="Comment">//: I'll throw some style conventions here for want of a better place for them.</span>
@@ -207,7 +207,7 @@ if ('onhashchange' in window) {
 <span id="L146" class="LineNr">146 </span><span class="Comment">//: yadda-yadda. Instead use this macro below to perform an unsafe cast to</span>
 <span id="L147" class="LineNr">147 </span><span class="Comment">//: signed. We'll just give up immediately if a container's ever too large.</span>
 <span id="L148" class="LineNr">148 </span><span class="Comment">//: Basically, Mu is not concerned about this being a little slower than it</span>
-<span id="L149" class="LineNr">149 </span><span class="Comment">//: could be. (<a href="https://gist.github.com/rygorous/e0f055bfb74e3d5f0af20690759de5a7">https://gist.github.com/rygorous/e0f055bfb74e3d5f0af20690759de5a7</a>)</span>
+<span id="L149" class="LineNr">149 </span><span class="Comment">//: could be. (<a href="https://gist.github.com/rygorous/e0f055bfb74e3d5f0af20690759de5a7)">https://gist.github.com/rygorous/e0f055bfb74e3d5f0af20690759de5a7)</a></span>
 <span id="L150" class="LineNr">150 </span><span class="Comment">//:</span>
 <span id="L151" class="LineNr">151 </span><span class="Comment">//: Addendum to corollary: We're going to uniformly use int everywhere, to</span>
 <span id="L152" class="LineNr">152 </span><span class="Comment">//: indicate that we're oblivious to number size, and since Clang on 32-bit</span>
@@ -219,7 +219,7 @@ if ('onhashchange' in window) {
 <span id="L158" class="LineNr">158 </span>
 <span id="L159" class="LineNr">159 </span><span class="Comment">//: 5. Integer overflow is guarded against at runtime using the -ftrapv flag</span>
 <span id="L160" class="LineNr">160 </span><span class="Comment">//: to the compiler, supported by Clang (GCC version only works sometimes:</span>
-<span id="L161" class="LineNr">161 </span><span class="Comment">//: <a href="http://stackoverflow.com/questions/20851061/how-to-make-gcc-ftrapv-work">http://stackoverflow.com/questions/20851061/how-to-make-gcc-ftrapv-work</a>).</span>
+<span id="L161" class="LineNr">161 </span><span class="Comment">//: <a href="http://stackoverflow.com/questions/20851061/how-to-make-gcc-ftrapv-work).">http://stackoverflow.com/questions/20851061/how-to-make-gcc-ftrapv-work).</a></span>
 <span id="L162" class="LineNr">162 </span><span class="Delimiter">:(before &quot;atexit(reset)&quot;)</span>
 <span id="L163" class="LineNr">163 </span><a href='001help.cc.html#L168'>initialize_signal_handlers</a><span class="Delimiter">();</span>  <span class="Comment">// not always necessary, but doesn't hurt</span>
 <span id="L164" class="LineNr">164 </span><span class="CommentedCode">//? cerr &lt;&lt; INT_MAX+1 &lt;&lt; '\n';  // test overflow</span>
@@ -287,17 +287,17 @@ if ('onhashchange' in window) {
 <span id="L226" class="LineNr">226 </span><span class="Comment">// from <a href="http://stackoverflow.com/questions/152643/idiomatic-c-for-reading-from-a-const-map">http://stackoverflow.com/questions/152643/idiomatic-c-for-reading-from-a-const-map</a></span>
 <span id="L227" class="LineNr">227 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> T&gt; <span class="Normal">typename</span> T::mapped_type&amp; get<span class="Delimiter">(</span>T&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L228" class="LineNr">228 </span>  <span class="Normal">typename</span> T::iterator iter<span class="Delimiter">(</span>map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">));</span>
-<span id="L229" class="LineNr">229 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>iter == map<span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L229" class="LineNr">229 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>iter == map<span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L230" class="LineNr">230 </span>    cerr &lt;&lt; <span class="Constant">&quot;get couldn't find key '&quot;</span> &lt;&lt; key &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L231" class="LineNr">231 </span>    assert<span class="Delimiter">(</span>iter != map<span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">());</span>
+<span id="L231" class="LineNr">231 </span>    assert<span class="Delimiter">(</span>iter != map<span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">());</span>
 <span id="L232" class="LineNr">232 </span>  <span class="Delimiter">}</span>
 <span id="L233" class="LineNr">233 </span>  <span class="Identifier">return</span> iter<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
 <span id="L234" class="LineNr">234 </span><span class="Delimiter">}</span>
 <span id="L235" class="LineNr">235 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> T&gt; <span class="Normal">typename</span> T::mapped_type <span class="Normal">const</span>&amp; get<span class="Delimiter">(</span><span class="Normal">const</span> T&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L236" class="LineNr">236 </span>  <span class="Normal">typename</span> T::const_iterator iter<span class="Delimiter">(</span>map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">));</span>
-<span id="L237" class="LineNr">237 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>iter == map<span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L237" class="LineNr">237 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>iter == map<span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L238" class="LineNr">238 </span>    cerr &lt;&lt; <span class="Constant">&quot;get couldn't find key '&quot;</span> &lt;&lt; key &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L239" class="LineNr">239 </span>    assert<span class="Delimiter">(</span>iter != map<span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">());</span>
+<span id="L239" class="LineNr">239 </span>    assert<span class="Delimiter">(</span>iter != map<span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">());</span>
 <span id="L240" class="LineNr">240 </span>  <span class="Delimiter">}</span>
 <span id="L241" class="LineNr">241 </span>  <span class="Identifier">return</span> iter<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
 <span id="L242" class="LineNr">242 </span><span class="Delimiter">}</span>
@@ -306,7 +306,7 @@ if ('onhashchange' in window) {
 <span id="L245" class="LineNr">245 </span>  <span class="Identifier">return</span> map[key]<span class="Delimiter">;</span>
 <span id="L246" class="LineNr">246 </span><span class="Delimiter">}</span>
 <span id="L247" class="LineNr">247 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> T&gt; <span class="Normal">bool</span> <a href='001help.cc.html#L247'>contains_key</a><span class="Delimiter">(</span>T&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L248" class="LineNr">248 </span>  <span class="Identifier">return</span> map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">)</span> != map<span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L248" class="LineNr">248 </span>  <span class="Identifier">return</span> map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">)</span> != map<span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L249" class="LineNr">249 </span><span class="Delimiter">}</span>
 <span id="L250" class="LineNr">250 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> T&gt; <span class="Normal">typename</span> T::mapped_type&amp; <a href='001help.cc.html#L250'>get_or_insert</a><span class="Delimiter">(</span>T&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L251" class="LineNr">251 </span>  <span class="Identifier">return</span> map[key]<span class="Delimiter">;</span>
diff --git a/html/subx/003trace.cc.html b/html/subx/003trace.cc.html
index 6fb7af1a..0a057b43 100644
--- a/html/subx/003trace.cc.html
+++ b/html/subx/003trace.cc.html
@@ -104,7 +104,7 @@ if ('onhashchange' in window) {
 <span id="L45" class="LineNr"> 45 </span><span class="Comment">//:</span>
 <span id="L46" class="LineNr"> 46 </span><span class="Comment">//: Between layers and domain-driven testing, programming starts to look like a</span>
 <span id="L47" class="LineNr"> 47 </span><span class="Comment">//: fundamentally different activity. Instead of a) superficial, b) local rules</span>
-<span id="L48" class="LineNr"> 48 </span><span class="Comment">//: on c) code [like say <a href="http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet">http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet</a>],</span>
+<span id="L48" class="LineNr"> 48 </span><span class="Comment">//: on c) code [like say <a href="http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet],">http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet],</a></span>
 <span id="L49" class="LineNr"> 49 </span><span class="Comment">//: we allow programmers to engage with the a) deep, b) global structure of the</span>
 <span id="L50" class="LineNr"> 50 </span><span class="Comment">//: c) domain. If you can systematically track discontinuities in the domain,</span>
 <span id="L51" class="LineNr"> 51 </span><span class="Comment">//: you don't care if the code used gotos as long as it passed the tests. If</span>
@@ -124,7 +124,7 @@ if ('onhashchange' in window) {
 <span id="L65" class="LineNr"> 65 </span><span class="Comment">//:</span>
 <span id="L66" class="LineNr"> 66 </span><span class="Comment">//:   &quot;Programming properly should be regarded as an activity by which</span>
 <span id="L67" class="LineNr"> 67 </span><span class="Comment">//:   programmers form a mental model, rather than as production of a program.&quot;</span>
-<span id="L68" class="LineNr"> 68 </span><span class="Comment">//:   -- Peter Naur (<a href="http://alistair.cockburn.us/ASD+book+extract%3A+%22Naur,+Ehn,+Musashi%22">http://alistair.cockburn.us/ASD+book+extract%3A+%22Naur,+Ehn,+Musashi%22</a>)</span>
+<span id="L68" class="LineNr"> 68 </span><span class="Comment">//:   -- Peter Naur (<a href="http://alistair.cockburn.us/ASD+book+extract%3A+%22Naur,+Ehn,+Musashi%22)">http://alistair.cockburn.us/ASD+book+extract%3A+%22Naur,+Ehn,+Musashi%22)</a></span>
 <span id="L69" class="LineNr"> 69 </span>
 <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>
@@ -148,20 +148,20 @@ if ('onhashchange' in window) {
 <span id="L89" class="LineNr"> 89 </span><span class="Comment">//: Traces can have a lot of overhead, so only turn them on when asked.</span>
 <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(before &quot;End Commandline Options(*arg)&quot;)</span>
 <span id="L91" class="LineNr"> 91 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--trace&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L92" class="LineNr"> 92 </span>  <a href='003trace.cc.html#L221'>Save_trace</a> =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L92" class="LineNr"> 92 </span>  <a href='003trace.cc.html#L223'>Save_trace</a> =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L93" class="LineNr"> 93 </span><span class="Delimiter">}</span>
 <span id="L94" class="LineNr"> 94 </span><span class="Delimiter">:(before &quot;End Commandline Parsing&quot;)</span>
-<span id="L95" class="LineNr"> 95 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L221'>Save_trace</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L96" class="LineNr"> 96 </span>  cerr &lt;&lt; <span class="Constant">&quot;initializing <a href='003trace.cc.html#L189'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L97" class="LineNr"> 97 </span>  <a href='003trace.cc.html#L182'>Trace_stream</a> = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span>
+<span id="L95" class="LineNr"> 95 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L223'>Save_trace</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L96" class="LineNr"> 96 </span>  cerr &lt;&lt; <span class="Constant">&quot;initializing <a href='003trace.cc.html#L190'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L97" class="LineNr"> 97 </span>  <a href='003trace.cc.html#L183'>Trace_stream</a> = <span class="Normal">new</span> trace_stream<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">:(code)</span>
 <span id="L100" class="LineNr">100 </span><span class="Normal">void</span> <a href='003trace.cc.html#L100'>cleanup_main</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L102" class="LineNr">102 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L221'>Save_trace</a><span class="Delimiter">)</span>
-<span id="L103" class="LineNr">103 </span>    <a href='003trace.cc.html#L182'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L141'>save</a><span class="Delimiter">();</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Normal">delete</span> <a href='003trace.cc.html#L182'>Trace_stream</a><span class="Delimiter">;</span>
-<span id="L105" class="LineNr">105 </span>  <a href='003trace.cc.html#L182'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L223'>Save_trace</a><span class="Delimiter">)</span>
+<span id="L103" class="LineNr">103 </span>    <a href='003trace.cc.html#L183'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L142'>save</a><span class="Delimiter">();</span>
+<span id="L104" class="LineNr">104 </span>  <span class="Normal">delete</span> <a href='003trace.cc.html#L183'>Trace_stream</a><span class="Delimiter">;</span>
+<span id="L105" class="LineNr">105 </span>  <a href='003trace.cc.html#L183'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
 <span id="L106" class="LineNr">106 </span><span class="Delimiter">}</span>
 <span id="L107" class="LineNr">107 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
 <span id="L108" class="LineNr">108 </span>atexit<span class="Delimiter">(</span><a href='003trace.cc.html#L100'>cleanup_main</a><span class="Delimiter">);</span>
@@ -172,310 +172,312 @@ if ('onhashchange' in window) {
 <span id="L113" class="LineNr">113 </span><span class="Comment">// compilation units. So no extern linkage.</span>
 <span id="L114" class="LineNr">114 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='003trace.cc.html#L114'>Max_depth</a> = <span class="Constant">9999</span><span class="Delimiter">;</span>
 <span id="L115" class="LineNr">115 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='003trace.cc.html#L115'>Error_depth</a> = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// definitely always print errors</span>
-<span id="L116" class="LineNr">116 </span>
-<span id="L117" class="LineNr">117 </span><span class="Normal">struct</span> trace_stream <span class="Delimiter">{</span>
-<span id="L118" class="LineNr">118 </span>  vector&lt;trace_line&gt; <a href='003trace.cc.html#L118'>past_lines</a><span class="Delimiter">;</span>
-<span id="L119" class="LineNr">119 </span>  <span class="Comment">// accumulator for current line</span>
-<span id="L120" class="LineNr">120 </span>  ostringstream* <a href='003trace.cc.html#L120'>curr_stream</a><span class="Delimiter">;</span>
-<span id="L121" class="LineNr">121 </span>  string <a href='003trace.cc.html#L121'>curr_label</a><span class="Delimiter">;</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Normal">int</span> <a href='003trace.cc.html#L122'>curr_depth</a><span class="Delimiter">;</span>
-<span id="L123" class="LineNr">123 </span>  <span class="Normal">int</span> <a href='003trace.cc.html#L123'>callstack_depth</a><span class="Delimiter">;</span>
-<span id="L124" class="LineNr">124 </span>  <span class="Normal">int</span> <a href='003trace.cc.html#L124'>collect_depth</a><span class="Delimiter">;</span>
-<span id="L125" class="LineNr">125 </span>  ofstream<span class="Constant"> null</span>_stream<span class="Delimiter">;</span>  <span class="Comment">// never opens a file, so writes silently fail</span>
-<span id="L126" class="LineNr">126 </span>  trace_stream<span class="Delimiter">()</span> :<a href='003trace.cc.html#L120'>curr_stream</a><span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> <a href='003trace.cc.html#L122'>curr_depth</a><span class="Delimiter">(</span><a href='003trace.cc.html#L114'>Max_depth</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L123'>callstack_depth</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <a href='003trace.cc.html#L124'>collect_depth</a><span class="Delimiter">(</span><a href='003trace.cc.html#L114'>Max_depth</a><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L127" class="LineNr">127 </span>  <a href='003trace.cc.html#L127'>~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#L120'>curr_stream</a><span class="Delimiter">)</span> <span class="Normal">delete</span> <a href='003trace.cc.html#L120'>curr_stream</a><span class="Delimiter">;</span> <span class="Delimiter">}</span>
-<span id="L128" class="LineNr">128 </span>
-<span id="L129" class="LineNr">129 </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="L130" class="LineNr">130 </span>    <span class="Identifier">return</span> stream<span class="Delimiter">(</span><a href='003trace.cc.html#L114'>Max_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>
-<span id="L131" class="LineNr">131 </span>  <span class="Delimiter">}</span>
-<span id="L132" class="LineNr">132 </span>
-<span id="L133" class="LineNr">133 </span>  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="L134" class="LineNr">134 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L72'>depth</a> &gt; <a href='003trace.cc.html#L124'>collect_depth</a><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> null</span>_stream<span class="Delimiter">;</span>
-<span id="L135" class="LineNr">135 </span>    <a href='003trace.cc.html#L120'>curr_stream</a> = <span class="Normal">new</span> ostringstream<span class="Delimiter">;</span>
-<span id="L136" class="LineNr">136 </span>    <a href='003trace.cc.html#L121'>curr_label</a> = <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">;</span>
-<span id="L137" class="LineNr">137 </span>    <a href='003trace.cc.html#L122'>curr_depth</a> = <a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">;</span>
-<span id="L138" class="LineNr">138 </span>    <span class="Identifier">return</span> *curr_stream<span class="Delimiter">;</span>
-<span id="L139" class="LineNr">139 </span>  <span class="Delimiter">}</span>
-<span id="L140" class="LineNr">140 </span>
-<span id="L141" class="LineNr">141 </span>  <span class="Normal">void</span> <a href='003trace.cc.html#L141'>save</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L142" class="LineNr">142 </span>    cerr &lt;&lt; <span class="Constant">&quot;saving <a href='003trace.cc.html#L189'>trace</a> to 'last_run'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L143" class="LineNr">143 </span>    ofstream fout<span class="Delimiter">(</span><span class="Constant">&quot;last_run&quot;</span><span class="Delimiter">);</span>
-<span id="L144" class="LineNr">144 </span>    fout &lt;&lt; <a href='003trace.cc.html#L171'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L145" class="LineNr">145 </span>    fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
-<span id="L146" class="LineNr">146 </span>  <span class="Delimiter">}</span>
-<span id="L147" class="LineNr">147 </span>
-<span id="L148" class="LineNr">148 </span>  <span class="Comment">// be sure to call this before messing with curr_stream or curr_label</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Normal">void</span> <a href='003trace.cc.html#L155'>newline</a><span class="Delimiter">();</span>
-<span id="L150" class="LineNr">150 </span>  <span class="Comment">// useful for debugging</span>
-<span id="L151" class="LineNr">151 </span>  string <a href='003trace.cc.html#L171'>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="L152" class="LineNr">152 </span><span class="Delimiter">};</span>
-<span id="L153" class="LineNr">153 </span>
-<span id="L154" class="LineNr">154 </span><span class="Delimiter">:(code)</span>
-<span id="L155" class="LineNr">155 </span><span class="Normal">void</span> trace_stream::<a href='003trace.cc.html#L155'>newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L156" class="LineNr">156 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L157" class="LineNr">157 </span>  string curr_contents = <a href='003trace.cc.html#L120'>curr_stream</a><span class="Delimiter">-&gt;</span>str<span class="Delimiter">();</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_contents<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L159" class="LineNr">159 </span>    <a href='003trace.cc.html#L118'>past_lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span><a href='003trace.cc.html#L122'>curr_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L121'>curr_label</a><span class="Delimiter">),</span> curr_contents<span class="Delimiter">));</span>  <span class="Comment">// preserve indent in contents</span>
-<span id="L160" class="LineNr">160 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>!Hide_errors &amp;&amp; <a href='003trace.cc.html#L121'>curr_label</a> == <span class="Constant">&quot;error&quot;</span><span class="Delimiter">)</span>
-<span id="L161" class="LineNr">161 </span>        || <a href='003trace.cc.html#L81'>Dump_trace</a>
-<span id="L162" class="LineNr">162 </span>        || <span class="Delimiter">(</span>!Dump_label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; <a href='003trace.cc.html#L121'>curr_label</a> == <a href='003trace.cc.html#L82'>Dump_label</a><span class="Delimiter">))</span>
-<span id="L163" class="LineNr">163 </span>      cerr &lt;&lt; <a href='003trace.cc.html#L121'>curr_label</a> &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; curr_contents &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L164" class="LineNr">164 </span>  <span class="Delimiter">}</span>
-<span id="L165" class="LineNr">165 </span>  <span class="Normal">delete</span> <a href='003trace.cc.html#L120'>curr_stream</a><span class="Delimiter">;</span>
-<span id="L166" class="LineNr">166 </span>  <a href='003trace.cc.html#L120'>curr_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L167" class="LineNr">167 </span>  <a href='003trace.cc.html#L121'>curr_label</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
-<span id="L168" class="LineNr">168 </span>  <a href='003trace.cc.html#L122'>curr_depth</a> = <a href='003trace.cc.html#L114'>Max_depth</a><span class="Delimiter">;</span>
-<span id="L169" class="LineNr">169 </span><span class="Delimiter">}</span>
-<span id="L170" class="LineNr">170 </span>
-<span id="L171" class="LineNr">171 </span>string trace_stream::<a href='003trace.cc.html#L171'>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="L172" class="LineNr">172 </span>  ostringstream output<span class="Delimiter">;</span>
-<span id="L173" class="LineNr">173 </span>  <a href='003trace.cc.html#L73'>label</a> = <a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>
-<span id="L174" class="LineNr">174 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L118'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L118'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L175" class="LineNr">175 </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="L176" class="LineNr">176 </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="L177" class="LineNr">177 </span>    <span class="Delimiter">}</span>
-<span id="L178" class="LineNr">178 </span>  <span class="Identifier">return</span> output<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L179" class="LineNr">179 </span><span class="Delimiter">}</span>
-<span id="L180" class="LineNr">180 </span>
-<span id="L181" class="LineNr">181 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L182" class="LineNr">182 </span>trace_stream* <a href='003trace.cc.html#L182'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L183" class="LineNr">183 </span><span class="Normal">int</span> <a href='003trace.cc.html#L183'>Trace_errors</a> = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// used only when Trace_stream is NULL</span>
-<span id="L184" class="LineNr">184 </span>
-<span id="L185" class="LineNr">185 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L186" class="LineNr">186 </span><span class="Comment">#define CLEAR_TRACE  delete Trace_stream, Trace_stream = new trace_stream;</span>
-<span id="L187" class="LineNr">187 </span>
-<span id="L188" class="LineNr">188 </span><span class="Comment">// Top-level helper. IMPORTANT: can't nest</span>
-<span id="L189" class="LineNr">189 </span><span class="Comment">#define trace(...)  !Trace_stream ? cerr /*print nothing*/ : Trace_stream-&gt;stream(__VA_ARGS__)</span>
-<span id="L190" class="LineNr">190 </span>
-<span id="L191" class="LineNr">191 </span><span class="Comment">// Just for debugging; 'git log' should never show any calls to 'dbg'.</span>
-<span id="L192" class="LineNr">192 </span><span class="Comment">#define dbg trace(0, &quot;a&quot;)</span>
-<span id="L193" class="LineNr">193 </span><span class="Comment">#define DUMP(label)  if (Trace_stream) cerr &lt;&lt; Trace_stream-&gt;readable_contents(label);</span>
-<span id="L194" class="LineNr">194 </span>
-<span id="L195" class="LineNr">195 </span><span class="Comment">// Errors are a special layer.</span>
-<span id="L196" class="LineNr">196 </span><span class="Comment">#define raise  (!Trace_stream ? (++Trace_errors,cerr) /*do print*/ : Trace_stream-&gt;stream(Error_depth, &quot;error&quot;))</span>
-<span id="L197" class="LineNr">197 </span><span class="Comment">// If we aren't yet sure how to deal with some corner case, use assert_for_now</span>
-<span id="L198" class="LineNr">198 </span><span class="Comment">// to indicate that it isn't an inviolable invariant.</span>
-<span id="L199" class="LineNr">199 </span><span class="Comment">#define assert_for_now assert</span>
-<span id="L200" class="LineNr">200 </span>
-<span id="L201" class="LineNr">201 </span><span class="Comment">// Inside tests, fail any tests that displayed (unexpected) errors.</span>
-<span id="L202" class="LineNr">202 </span><span class="Comment">// Expected errors in tests should always be hidden and silently checked for.</span>
-<span id="L203" class="LineNr">203 </span><span class="Delimiter">:(before &quot;End Test Teardown&quot;)</span>
-<span id="L204" class="LineNr">204 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> &amp;&amp; !Hide_errors &amp;&amp; <a href='003trace.cc.html#L208'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L205" class="LineNr">205 </span>  <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L206" class="LineNr">206 </span><span class="Delimiter">}</span>
-<span id="L207" class="LineNr">207 </span><span class="Delimiter">:(code)</span>
-<span id="L208" class="LineNr">208 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L208'>trace_contains_errors</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L209" class="LineNr">209 </span>  <span class="Identifier">return</span> <a href='003trace.cc.html#L183'>Trace_errors</a> &gt; <span class="Constant">0</span> || trace_count<span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">)</span> &gt; <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L210" class="LineNr">210 </span><span class="Delimiter">}</span>
-<span id="L211" class="LineNr">211 </span>
-<span id="L212" class="LineNr">212 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L213" class="LineNr">213 </span><span class="Normal">struct</span> <a href='003trace.cc.html#L213'>end</a> <span class="Delimiter">{};</span>
-<span id="L214" class="LineNr">214 </span><span class="Delimiter">:(code)</span>
-<span id="L215" class="LineNr">215 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> <a href='003trace.cc.html#L213'>end</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L216" class="LineNr">216 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L182'>Trace_stream</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L182'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L155'>newline</a><span class="Delimiter">();</span>
-<span id="L217" class="LineNr">217 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
-<span id="L218" class="LineNr">218 </span><span class="Delimiter">}</span>
-<span id="L219" class="LineNr">219 </span>
-<span id="L220" class="LineNr">220 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L221" class="LineNr">221 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L221'>Save_trace</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, write out trace to disk</span>
-<span id="L222" class="LineNr">222 </span>
-<span id="L223" class="LineNr">223 </span><span class="Comment">// Trace_stream is a resource, lease_tracer uses RAII to manage it.</span>
-<span id="L224" class="LineNr">224 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L225" class="LineNr">225 </span><span class="Normal">struct</span> lease_tracer <span class="Delimiter">{</span>
-<span id="L226" class="LineNr">226 </span>  lease_tracer<span class="Delimiter">();</span>
-<span id="L227" class="LineNr">227 </span>  <a href='003trace.cc.html#L231'>~lease_tracer</a><span class="Delimiter">();</span>
-<span id="L228" class="LineNr">228 </span><span class="Delimiter">};</span>
-<span id="L229" class="LineNr">229 </span><span class="Delimiter">:(code)</span>
-<span id="L230" class="LineNr">230 </span>lease_tracer::lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> <a href='003trace.cc.html#L182'>Trace_stream</a> = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span>
-<span id="L231" class="LineNr">231 </span>lease_tracer::<a href='003trace.cc.html#L231'>~lease_tracer</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L232" class="LineNr">232 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L221'>Save_trace</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L182'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L141'>save</a><span class="Delimiter">();</span>
-<span id="L233" class="LineNr">233 </span>  <span class="Normal">delete</span> <a href='003trace.cc.html#L182'>Trace_stream</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L182'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L234" class="LineNr">234 </span><span class="Delimiter">}</span>
-<span id="L235" class="LineNr">235 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L236" class="LineNr">236 </span><span class="Comment">#define START_TRACING_UNTIL_END_OF_SCOPE  lease_tracer leased_tracer;</span>
-<span id="L237" class="LineNr">237 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
-<span id="L238" class="LineNr">238 </span><a href='003trace.cc.html#L236'>START_TRACING_UNTIL_END_OF_SCOPE</a>
-<span id="L239" class="LineNr">239 </span>
-<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L241" class="LineNr">241 </span><span class="Comment">#define CHECK_TRACE_CONTENTS(...)  check_trace_contents(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)</span>
-<span id="L242" class="LineNr">242 </span>
-<span id="L243" class="LineNr">243 </span><span class="Comment">#define CHECK_TRACE_CONTAINS_ERRORS()  CHECK(trace_contains_errors())</span>
-<span id="L244" class="LineNr">244 </span><span class="Comment">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span>
-<span id="L245" class="LineNr">245 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> &amp;&amp; <a href='003trace.cc.html#L208'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> \
-<span id="L246" class="LineNr">246 </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;): unexpected errors</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span> \
-<span id="L247" class="LineNr">247 </span>    <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">);</span> \
-<span id="L248" class="LineNr">248 </span>    <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
-<span id="L249" class="LineNr">249 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span> \
-<span id="L250" class="LineNr">250 </span>  <span class="Delimiter">}</span>
-<span id="L251" class="LineNr">251 </span>
-<span id="L252" class="LineNr">252 </span><span class="Comment">#define CHECK_TRACE_COUNT(label, count) \</span>
-<span id="L253" class="LineNr">253 </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="L254" class="LineNr">254 </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="L255" class="LineNr">255 </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="L256" class="LineNr">256 </span>    <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span> \
-<span id="L257" class="LineNr">257 </span>    <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
-<span id="L258" class="LineNr">258 </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="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_DOESNT_CONTAIN(...)  CHECK(trace_doesnt_contain(__VA_ARGS__))</span>
+<span id="L116" class="LineNr">116 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='003trace.cc.html#L116'>Warn_depth</a> = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L117" class="LineNr">117 </span>
+<span id="L118" class="LineNr">118 </span><span class="Normal">struct</span> trace_stream <span class="Delimiter">{</span>
+<span id="L119" class="LineNr">119 </span>  vector&lt;trace_line&gt; <a href='003trace.cc.html#L119'>past_lines</a><span class="Delimiter">;</span>
+<span id="L120" class="LineNr">120 </span>  <span class="Comment">// accumulator for current line</span>
+<span id="L121" class="LineNr">121 </span>  ostringstream* <a href='003trace.cc.html#L121'>curr_stream</a><span class="Delimiter">;</span>
+<span id="L122" class="LineNr">122 </span>  string <a href='003trace.cc.html#L122'>curr_label</a><span class="Delimiter">;</span>
+<span id="L123" class="LineNr">123 </span>  <span class="Normal">int</span> <a href='003trace.cc.html#L123'>curr_depth</a><span class="Delimiter">;</span>
+<span id="L124" class="LineNr">124 </span>  <span class="Normal">int</span> <a href='003trace.cc.html#L124'>callstack_depth</a><span class="Delimiter">;</span>
+<span id="L125" class="LineNr">125 </span>  <span class="Normal">int</span> <a href='003trace.cc.html#L125'>collect_depth</a><span class="Delimiter">;</span>
+<span id="L126" class="LineNr">126 </span>  ofstream<span class="Constant"> null</span>_stream<span class="Delimiter">;</span>  <span class="Comment">// never opens a file, so writes silently fail</span>
+<span id="L127" class="LineNr">127 </span>  trace_stream<span class="Delimiter">()</span> :<a href='003trace.cc.html#L121'>curr_stream</a><span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> <a href='003trace.cc.html#L123'>curr_depth</a><span class="Delimiter">(</span><a href='003trace.cc.html#L114'>Max_depth</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L124'>callstack_depth</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <a href='003trace.cc.html#L125'>collect_depth</a><span class="Delimiter">(</span><a href='003trace.cc.html#L114'>Max_depth</a><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L128" class="LineNr">128 </span>  <a href='003trace.cc.html#L128'>~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#L121'>curr_stream</a><span class="Delimiter">)</span> <span class="Normal">delete</span> <a href='003trace.cc.html#L121'>curr_stream</a><span class="Delimiter">;</span> <span class="Delimiter">}</span>
+<span id="L129" class="LineNr">129 </span>
+<span id="L130" class="LineNr">130 </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="L131" class="LineNr">131 </span>    <span class="Identifier">return</span> stream<span class="Delimiter">(</span><a href='003trace.cc.html#L114'>Max_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>
+<span id="L132" class="LineNr">132 </span>  <span class="Delimiter">}</span>
+<span id="L133" class="LineNr">133 </span>
+<span id="L134" class="LineNr">134 </span>  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="L135" class="LineNr">135 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L72'>depth</a> &gt; <a href='003trace.cc.html#L125'>collect_depth</a><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> null</span>_stream<span class="Delimiter">;</span>
+<span id="L136" class="LineNr">136 </span>    <a href='003trace.cc.html#L121'>curr_stream</a> = <span class="Normal">new</span> ostringstream<span class="Delimiter">;</span>
+<span id="L137" class="LineNr">137 </span>    <a href='003trace.cc.html#L122'>curr_label</a> = <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">;</span>
+<span id="L138" class="LineNr">138 </span>    <a href='003trace.cc.html#L123'>curr_depth</a> = <a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">;</span>
+<span id="L139" class="LineNr">139 </span>    <span class="Identifier">return</span> *curr_stream<span class="Delimiter">;</span>
+<span id="L140" class="LineNr">140 </span>  <span class="Delimiter">}</span>
+<span id="L141" class="LineNr">141 </span>
+<span id="L142" class="LineNr">142 </span>  <span class="Normal">void</span> <a href='003trace.cc.html#L142'>save</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L143" class="LineNr">143 </span>    cerr &lt;&lt; <span class="Constant">&quot;saving <a href='003trace.cc.html#L190'>trace</a> to 'last_run'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L144" class="LineNr">144 </span>    ofstream fout<span class="Delimiter">(</span><span class="Constant">&quot;last_run&quot;</span><span class="Delimiter">);</span>
+<span id="L145" class="LineNr">145 </span>    fout &lt;&lt; <a href='003trace.cc.html#L172'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span>    fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
+<span id="L147" class="LineNr">147 </span>  <span class="Delimiter">}</span>
+<span id="L148" class="LineNr">148 </span>
+<span id="L149" class="LineNr">149 </span>  <span class="Comment">// be sure to call this before messing with curr_stream or curr_label</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Normal">void</span> <a href='003trace.cc.html#L156'>newline</a><span class="Delimiter">();</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Comment">// useful for debugging</span>
+<span id="L152" class="LineNr">152 </span>  string <a href='003trace.cc.html#L172'>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="L153" class="LineNr">153 </span><span class="Delimiter">};</span>
+<span id="L154" class="LineNr">154 </span>
+<span id="L155" class="LineNr">155 </span><span class="Delimiter">:(code)</span>
+<span id="L156" class="LineNr">156 </span><span class="Normal">void</span> trace_stream::<a href='003trace.cc.html#L156'>newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L157" class="LineNr">157 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L158" class="LineNr">158 </span>  string curr_contents = <a href='003trace.cc.html#L121'>curr_stream</a><span class="Delimiter">-&gt;</span>str<span class="Delimiter">();</span>
+<span id="L159" class="LineNr">159 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_contents<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L160" class="LineNr">160 </span>    <a href='003trace.cc.html#L119'>past_lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span><a href='003trace.cc.html#L123'>curr_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L122'>curr_label</a><span class="Delimiter">),</span> curr_contents<span class="Delimiter">));</span>  <span class="Comment">// preserve indent in contents</span>
+<span id="L161" class="LineNr">161 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>!Hide_errors &amp;&amp; <a href='003trace.cc.html#L122'>curr_label</a> == <span class="Constant">&quot;error&quot;</span><span class="Delimiter">)</span>
+<span id="L162" class="LineNr">162 </span>        || <a href='003trace.cc.html#L81'>Dump_trace</a>
+<span id="L163" class="LineNr">163 </span>        || <span class="Delimiter">(</span>!Dump_label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; <a href='003trace.cc.html#L122'>curr_label</a> == <a href='003trace.cc.html#L82'>Dump_label</a><span class="Delimiter">))</span>
+<span id="L164" class="LineNr">164 </span>      cerr &lt;&lt; <a href='003trace.cc.html#L122'>curr_label</a> &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; curr_contents &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L165" class="LineNr">165 </span>  <span class="Delimiter">}</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Normal">delete</span> <a href='003trace.cc.html#L121'>curr_stream</a><span class="Delimiter">;</span>
+<span id="L167" class="LineNr">167 </span>  <a href='003trace.cc.html#L121'>curr_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L168" class="LineNr">168 </span>  <a href='003trace.cc.html#L122'>curr_label</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
+<span id="L169" class="LineNr">169 </span>  <a href='003trace.cc.html#L123'>curr_depth</a> = <a href='003trace.cc.html#L114'>Max_depth</a><span class="Delimiter">;</span>
+<span id="L170" class="LineNr">170 </span><span class="Delimiter">}</span>
+<span id="L171" class="LineNr">171 </span>
+<span id="L172" class="LineNr">172 </span>string trace_stream::<a href='003trace.cc.html#L172'>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="L173" class="LineNr">173 </span>  ostringstream output<span class="Delimiter">;</span>
+<span id="L174" class="LineNr">174 </span>  <a href='003trace.cc.html#L73'>label</a> = <a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>
+<span id="L175" class="LineNr">175 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L119'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L119'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L176" class="LineNr">176 </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="L177" class="LineNr">177 </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="L178" class="LineNr">178 </span>    <span class="Delimiter">}</span>
+<span id="L179" class="LineNr">179 </span>  <span class="Identifier">return</span> output<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L180" class="LineNr">180 </span><span class="Delimiter">}</span>
+<span id="L181" class="LineNr">181 </span>
+<span id="L182" class="LineNr">182 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L183" class="LineNr">183 </span>trace_stream* <a href='003trace.cc.html#L183'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L184" class="LineNr">184 </span><span class="Normal">int</span> <a href='003trace.cc.html#L184'>Trace_errors</a> = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// used only when Trace_stream is NULL</span>
+<span id="L185" class="LineNr">185 </span>
+<span id="L186" class="LineNr">186 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L187" class="LineNr">187 </span><span class="Comment">#define CLEAR_TRACE  delete Trace_stream, Trace_stream = new trace_stream;</span>
+<span id="L188" class="LineNr">188 </span>
+<span id="L189" class="LineNr">189 </span><span class="Comment">// Top-level helper. IMPORTANT: can't nest</span>
+<span id="L190" class="LineNr">190 </span><span class="Comment">#define trace(...)  !Trace_stream ? cerr /*print nothing*/ : Trace_stream-&gt;stream(__VA_ARGS__)</span>
+<span id="L191" class="LineNr">191 </span>
+<span id="L192" class="LineNr">192 </span><span class="Comment">// Just for debugging; 'git log' should never show any calls to 'dbg'.</span>
+<span id="L193" class="LineNr">193 </span><span class="Comment">#define dbg trace(0, &quot;a&quot;)</span>
+<span id="L194" class="LineNr">194 </span><span class="Comment">#define DUMP(label)  if (Trace_stream) cerr &lt;&lt; Trace_stream-&gt;readable_contents(label);</span>
+<span id="L195" class="LineNr">195 </span>
+<span id="L196" class="LineNr">196 </span><span class="Comment">// Errors and warnings are special layers.</span>
+<span id="L197" class="LineNr">197 </span><span class="Comment">#define raise  (!Trace_stream ? (++Trace_errors,cerr) /*do print*/ : Trace_stream-&gt;stream(Error_depth, &quot;error&quot;))</span>
+<span id="L198" class="LineNr">198 </span><span class="Comment">#define warn (!Trace_stream ? (++Trace_errors,cerr) /*do print*/ : Trace_stream-&gt;stream(Warn_depth, &quot;warn&quot;))</span>
+<span id="L199" class="LineNr">199 </span><span class="Comment">// If we aren't yet sure how to deal with some corner case, use assert_for_now</span>
+<span id="L200" class="LineNr">200 </span><span class="Comment">// to indicate that it isn't an inviolable invariant.</span>
+<span id="L201" class="LineNr">201 </span><span class="Comment">#define assert_for_now assert</span>
+<span id="L202" class="LineNr">202 </span>
+<span id="L203" class="LineNr">203 </span><span class="Comment">// Inside tests, fail any tests that displayed (unexpected) errors.</span>
+<span id="L204" class="LineNr">204 </span><span class="Comment">// Expected errors in tests should always be hidden and silently checked for.</span>
+<span id="L205" class="LineNr">205 </span><span class="Delimiter">:(before &quot;End Test Teardown&quot;)</span>
+<span id="L206" class="LineNr">206 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> &amp;&amp; !Hide_errors &amp;&amp; <a href='003trace.cc.html#L210'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L207" class="LineNr">207 </span>  <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L208" class="LineNr">208 </span><span class="Delimiter">}</span>
+<span id="L209" class="LineNr">209 </span><span class="Delimiter">:(code)</span>
+<span id="L210" class="LineNr">210 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L210'>trace_contains_errors</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L211" class="LineNr">211 </span>  <span class="Identifier">return</span> <a href='003trace.cc.html#L184'>Trace_errors</a> &gt; <span class="Constant">0</span> || trace_count<span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">)</span> &gt; <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L212" class="LineNr">212 </span><span class="Delimiter">}</span>
+<span id="L213" class="LineNr">213 </span>
+<span id="L214" class="LineNr">214 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L215" class="LineNr">215 </span><span class="Normal">struct</span> <a href='003trace.cc.html#L215'>end</a> <span class="Delimiter">{};</span>
+<span id="L216" class="LineNr">216 </span><span class="Delimiter">:(code)</span>
+<span id="L217" class="LineNr">217 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> <a href='003trace.cc.html#L215'>end</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L218" class="LineNr">218 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L183'>Trace_stream</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L183'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L156'>newline</a><span class="Delimiter">();</span>
+<span id="L219" class="LineNr">219 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
+<span id="L220" class="LineNr">220 </span><span class="Delimiter">}</span>
+<span id="L221" class="LineNr">221 </span>
+<span id="L222" class="LineNr">222 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L223" class="LineNr">223 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L223'>Save_trace</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, write out trace to disk</span>
+<span id="L224" class="LineNr">224 </span>
+<span id="L225" class="LineNr">225 </span><span class="Comment">// Trace_stream is a resource, lease_tracer uses RAII to manage it.</span>
+<span id="L226" class="LineNr">226 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L227" class="LineNr">227 </span><span class="Normal">struct</span> lease_tracer <span class="Delimiter">{</span>
+<span id="L228" class="LineNr">228 </span>  lease_tracer<span class="Delimiter">();</span>
+<span id="L229" class="LineNr">229 </span>  <a href='003trace.cc.html#L233'>~lease_tracer</a><span class="Delimiter">();</span>
+<span id="L230" class="LineNr">230 </span><span class="Delimiter">};</span>
+<span id="L231" class="LineNr">231 </span><span class="Delimiter">:(code)</span>
+<span id="L232" class="LineNr">232 </span>lease_tracer::lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> <a href='003trace.cc.html#L183'>Trace_stream</a> = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span>
+<span id="L233" class="LineNr">233 </span>lease_tracer::<a href='003trace.cc.html#L233'>~lease_tracer</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L234" class="LineNr">234 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L223'>Save_trace</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L183'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L142'>save</a><span class="Delimiter">();</span>
+<span id="L235" class="LineNr">235 </span>  <span class="Normal">delete</span> <a href='003trace.cc.html#L183'>Trace_stream</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L183'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L236" class="LineNr">236 </span><span class="Delimiter">}</span>
+<span id="L237" class="LineNr">237 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L238" class="LineNr">238 </span><span class="Comment">#define START_TRACING_UNTIL_END_OF_SCOPE  lease_tracer leased_tracer;</span>
+<span id="L239" class="LineNr">239 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
+<span id="L240" class="LineNr">240 </span><a href='003trace.cc.html#L238'>START_TRACING_UNTIL_END_OF_SCOPE</a>
+<span id="L241" class="LineNr">241 </span>
+<span id="L242" class="LineNr">242 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L243" class="LineNr">243 </span><span class="Comment">#define CHECK_TRACE_CONTENTS(...)  check_trace_contents(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)</span>
+<span id="L244" class="LineNr">244 </span>
+<span id="L245" class="LineNr">245 </span><span class="Comment">#define CHECK_TRACE_CONTAINS_ERRORS()  CHECK(trace_contains_errors())</span>
+<span id="L246" class="LineNr">246 </span><span class="Comment">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span>
+<span id="L247" class="LineNr">247 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> &amp;&amp; <a href='003trace.cc.html#L210'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> \
+<span id="L248" class="LineNr">248 </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;): unexpected errors</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span> \
+<span id="L249" class="LineNr">249 </span>    <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">);</span> \
+<span id="L250" class="LineNr">250 </span>    <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
+<span id="L251" class="LineNr">251 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span> \
+<span id="L252" class="LineNr">252 </span>  <span class="Delimiter">}</span>
+<span id="L253" class="LineNr">253 </span>
+<span id="L254" class="LineNr">254 </span><span class="Comment">#define CHECK_TRACE_COUNT(label, count) \</span>
+<span id="L255" class="LineNr">255 </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="L256" class="LineNr">256 </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="L257" class="LineNr">257 </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="L258" class="LineNr">258 </span>    <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span> \
+<span id="L259" class="LineNr">259 </span>    <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
+<span id="L260" class="LineNr">260 </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="L261" class="LineNr">261 </span>  <span class="Delimiter">}</span>
 <span id="L262" class="LineNr">262 </span>
-<span id="L263" class="LineNr">263 </span><span class="Delimiter">:(code)</span>
-<span id="L264" class="LineNr">264 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L264'>check_trace_contents</a><span class="Delimiter">(</span>string FUNCTION<span class="Delimiter">,</span> string <span class="Normal">FILE</span><span class="Delimiter">,</span> <span class="Normal">int</span> LINE<span class="Delimiter">,</span> string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L265" class="LineNr">265 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L266" class="LineNr">266 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L267" class="LineNr">267 </span>  vector&lt;string&gt; expected_lines = <a href='003trace.cc.html#L354'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;^D&quot;</span><span class="Delimiter">);</span>
-<span id="L268" class="LineNr">268 </span>  <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L269" class="LineNr">269 </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="L270" class="LineNr">270 </span>    ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L271" class="LineNr">271 </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="L272" class="LineNr">272 </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="L273" class="LineNr">273 </span>  <a href='003trace.cc.html#L296'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &amp;label<span class="Delimiter">,</span> &amp;contents<span class="Delimiter">);</span>
-<span id="L274" class="LineNr">274 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L182'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L118'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L182'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L118'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L275" class="LineNr">275 </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="L276" class="LineNr">276 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> != <a href='003trace.cc.html#L378'>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="L277" class="LineNr">277 </span>    ++curr_expected_line<span class="Delimiter">;</span>
-<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>    <a href='003trace.cc.html#L296'>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="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">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L309'>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="L285" class="LineNr">285 </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#L108'>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#L189'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L286" class="LineNr">286 </span>    <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L287" class="LineNr">287 </span>  <span class="Delimiter">}</span>
-<span id="L288" class="LineNr">288 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L289" class="LineNr">289 </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#L189'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L290" class="LineNr">290 </span>    <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>
-<span id="L291" class="LineNr">291 </span>  <span class="Delimiter">}</span>
-<span id="L292" class="LineNr">292 </span>  <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L293" class="LineNr">293 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L294" class="LineNr">294 </span><span class="Delimiter">}</span>
-<span id="L295" class="LineNr">295 </span>
-<span id="L296" class="LineNr">296 </span><span class="Normal">void</span> <a href='003trace.cc.html#L296'>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="L297" class="LineNr">297 </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="L298" class="LineNr">298 </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="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L300" class="LineNr">300 </span>    *label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L301" class="LineNr">301 </span>    *contents = <a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">);</span>
-<span id="L302" class="LineNr">302 </span>  <span class="Delimiter">}</span>
-<span id="L303" class="LineNr">303 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L304" class="LineNr">304 </span>    *label = <a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> pos<span class="Delimiter">));</span>
-<span id="L305" class="LineNr">305 </span>    *contents = <a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span>pos+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">)));</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Delimiter">}</span>
-<span id="L307" class="LineNr">307 </span><span class="Delimiter">}</span>
-<span id="L308" class="LineNr">308 </span>
-<span id="L309" class="LineNr">309 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L309'>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="L310" class="LineNr">310 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L182'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L118'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L182'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L118'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L311" class="LineNr">311 </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="L312" class="LineNr">312 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> == <a href='003trace.cc.html#L378'>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="L313" class="LineNr">313 </span>  <span class="Delimiter">}</span>
-<span id="L314" class="LineNr">314 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L315" class="LineNr">315 </span><span class="Delimiter">}</span>
-<span id="L316" class="LineNr">316 </span>
-<span id="L317" class="LineNr">317 </span><span class="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="L318" class="LineNr">318 </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="L319" class="LineNr">319 </span><span class="Delimiter">}</span>
-<span id="L320" class="LineNr">320 </span>
-<span id="L321" class="LineNr">321 </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#L108'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L322" class="LineNr">322 </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="L323" class="LineNr">323 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L324" class="LineNr">324 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L182'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L118'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L182'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L118'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L325" class="LineNr">325 </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="L326" class="LineNr">326 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011run.cc.html#L108'>line</a> == <span class="Constant">&quot;&quot;</span> || <a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><a href='011run.cc.html#L108'>line</a><span class="Delimiter">)</span> == <a href='003trace.cc.html#L378'>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="L327" class="LineNr">327 </span>        ++result<span class="Delimiter">;</span>
-<span id="L328" class="LineNr">328 </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> result<span class="Delimiter">;</span>
-<span id="L331" class="LineNr">331 </span><span class="Delimiter">}</span>
-<span id="L332" class="LineNr">332 </span>
-<span id="L333" class="LineNr">333 </span><span class="Normal">int</span> <a href='003trace.cc.html#L333'>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="L334" class="LineNr">334 </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="L335" class="LineNr">335 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L336" class="LineNr">336 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L182'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L118'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L182'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L118'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L337" class="LineNr">337 </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="L338" class="LineNr">338 </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#L378'>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#L378'>trim</a><span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span>
-<span id="L339" class="LineNr">339 </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 class="Delimiter">}</span>
-<span id="L342" class="LineNr">342 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L343" class="LineNr">343 </span><span class="Delimiter">}</span>
-<span id="L344" class="LineNr">344 </span>
-<span id="L345" class="LineNr">345 </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#L108'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L346" class="LineNr">346 </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#L108'>line</a><span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L347" class="LineNr">347 </span><span class="Delimiter">}</span>
-<span id="L348" class="LineNr">348 </span>
-<span id="L349" class="LineNr">349 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L350" class="LineNr">350 </span>  vector&lt;string&gt; tmp = <a href='003trace.cc.html#L369'>split_first</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Identifier">return</span> trace_doesnt_contain<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
-<span id="L352" class="LineNr">352 </span><span class="Delimiter">}</span>
-<span id="L353" class="LineNr">353 </span>
-<span id="L354" class="LineNr">354 </span>vector&lt;string&gt; <a href='003trace.cc.html#L354'>split</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L355" class="LineNr">355 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
-<span id="L356" class="LineNr">356 </span>  <span class="Normal">size_t</span> begin=<span class="Constant">0</span><span class="Delimiter">,</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L357" class="LineNr">357 </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="L358" class="LineNr">358 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L213'>end</a> == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L359" class="LineNr">359 </span>      result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> begin<span class="Delimiter">,</span> string::npos<span class="Delimiter">));</span>
-<span id="L360" class="LineNr">360 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L361" class="LineNr">361 </span>    <span class="Delimiter">}</span>
-<span id="L362" class="LineNr">362 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> begin<span class="Delimiter">,</span> end-begin<span class="Delimiter">));</span>
-<span id="L363" class="LineNr">363 </span>    begin = end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L364" class="LineNr">364 </span>    <a href='003trace.cc.html#L213'>end</a> = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">,</span> begin<span class="Delimiter">);</span>
-<span id="L365" class="LineNr">365 </span>  <span class="Delimiter">}</span>
-<span id="L366" class="LineNr">366 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L367" class="LineNr">367 </span><span class="Delimiter">}</span>
-<span id="L368" class="LineNr">368 </span>
-<span id="L369" class="LineNr">369 </span>vector&lt;string&gt; <a href='003trace.cc.html#L369'>split_first</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L370" class="LineNr">370 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
-<span id="L371" class="LineNr">371 </span>  <span class="Normal">size_t</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L372" class="LineNr">372 </span>  result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">));</span>
-<span id="L373" class="LineNr">373 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L213'>end</a> != string::npos<span class="Delimiter">)</span>
-<span id="L374" class="LineNr">374 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">),</span> string::npos<span class="Delimiter">));</span>
-<span id="L375" class="LineNr">375 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L376" class="LineNr">376 </span><span class="Delimiter">}</span>
-<span id="L377" class="LineNr">377 </span>
-<span id="L378" class="LineNr">378 </span>string <a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L379" class="LineNr">379 </span>  string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
-<span id="L380" class="LineNr">380 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>first != s<span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*first<span class="Delimiter">))</span>
-<span id="L381" class="LineNr">381 </span>    ++first<span class="Delimiter">;</span>
-<span id="L382" class="LineNr">382 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>first == s<span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L383" class="LineNr">383 </span>
-<span id="L384" class="LineNr">384 </span>  string::const_iterator last = --s<span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L385" class="LineNr">385 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>last != s<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*last<span class="Delimiter">))</span>
-<span id="L386" class="LineNr">386 </span>    --last<span class="Delimiter">;</span>
-<span id="L387" class="LineNr">387 </span>  ++last<span class="Delimiter">;</span>
-<span id="L388" class="LineNr">388 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>first<span class="Delimiter">,</span> last<span class="Delimiter">);</span>
-<span id="L389" class="LineNr">389 </span><span class="Delimiter">}</span>
-<span id="L390" class="LineNr">390 </span>
-<span id="L391" class="LineNr">391 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L392" class="LineNr">392 </span><span class="Comment">#include &lt;vector&gt;</span>
-<span id="L393" class="LineNr">393 </span><span class="Normal">using</span> std::vector<span class="Delimiter">;</span>
-<span id="L394" class="LineNr">394 </span><span class="Comment">#include &lt;list&gt;</span>
-<span id="L395" class="LineNr">395 </span><span class="Normal">using</span> std::list<span class="Delimiter">;</span>
-<span id="L396" class="LineNr">396 </span><span class="Comment">#include &lt;set&gt;</span>
-<span id="L397" class="LineNr">397 </span><span class="Normal">using</span> std::set<span class="Delimiter">;</span>
-<span id="L398" class="LineNr">398 </span>
-<span id="L399" class="LineNr">399 </span><span class="Comment">#include &lt;sstream&gt;</span>
-<span id="L400" class="LineNr">400 </span><span class="Normal">using</span> std::istringstream<span class="Delimiter">;</span>
-<span id="L401" class="LineNr">401 </span><span class="Normal">using</span> std::ostringstream<span class="Delimiter">;</span>
-<span id="L402" class="LineNr">402 </span>
-<span id="L403" class="LineNr">403 </span><span class="Comment">#include &lt;fstream&gt;</span>
-<span id="L404" class="LineNr">404 </span><span class="Normal">using</span> std::ifstream<span class="Delimiter">;</span>
-<span id="L405" class="LineNr">405 </span><span class="Normal">using</span> std::ofstream<span class="Delimiter">;</span>
-<span id="L406" class="LineNr">406 </span>
-<span id="L407" class="LineNr">407 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L408" class="LineNr">408 </span><span class="Comment">//: In future layers we'll use the depth field as follows:</span>
-<span id="L409" class="LineNr">409 </span><span class="Comment">//:</span>
-<span id="L410" class="LineNr">410 </span><span class="Comment">//: Errors will be depth 0.</span>
-<span id="L411" class="LineNr">411 </span><span class="Comment">//: Mu 'applications' will be able to use depths 1-100 as they like.</span>
-<span id="L412" class="LineNr">412 </span><span class="Comment">//: Primitive statements will occupy 101-9989</span>
-<span id="L413" class="LineNr">413 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> <a href='003trace.cc.html#L413'>Initial_callstack_depth</a> = <span class="Constant">101</span><span class="Delimiter">;</span>
-<span id="L414" class="LineNr">414 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> <a href='003trace.cc.html#L414'>Max_callstack_depth</a> = <span class="Constant">9989</span><span class="Delimiter">;</span>
-<span id="L415" class="LineNr">415 </span><span class="Comment">//: Finally, details of primitive Mu statements will occupy depth 9990-9999</span>
-<span id="L416" class="LineNr">416 </span><span class="Comment">//: (more on that later as well)</span>
-<span id="L417" class="LineNr">417 </span><span class="Comment">//:</span>
-<span id="L418" class="LineNr">418 </span><span class="Comment">//: This framework should help us hide some details at each level, mixing</span>
-<span id="L419" class="LineNr">419 </span><span class="Comment">//: static ideas like layers with the dynamic notion of call-stack depth.</span>
+<span id="L263" class="LineNr">263 </span><span class="Comment">#define CHECK_TRACE_DOESNT_CONTAIN(...)  CHECK(trace_doesnt_contain(__VA_ARGS__))</span>
+<span id="L264" class="LineNr">264 </span>
+<span id="L265" class="LineNr">265 </span><span class="Delimiter">:(code)</span>
+<span id="L266" class="LineNr">266 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L266'>check_trace_contents</a><span class="Delimiter">(</span>string FUNCTION<span class="Delimiter">,</span> string <span class="Normal">FILE</span><span class="Delimiter">,</span> <span class="Normal">int</span> LINE<span class="Delimiter">,</span> string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L267" class="LineNr">267 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L268" class="LineNr">268 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L269" class="LineNr">269 </span>  vector&lt;string&gt; expected_lines = <a href='003trace.cc.html#L356'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;^D&quot;</span><span class="Delimiter">);</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L271" class="LineNr">271 </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="L272" class="LineNr">272 </span>    ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L273" class="LineNr">273 </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="L274" class="LineNr">274 </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="L275" class="LineNr">275 </span>  <a href='003trace.cc.html#L298'>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="L276" class="LineNr">276 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L183'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L119'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L183'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L119'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L277" class="LineNr">277 </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="L278" class="LineNr">278 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> != <a href='003trace.cc.html#L380'>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="L279" class="LineNr">279 </span>    ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L280" class="LineNr">280 </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="L281" class="LineNr">281 </span>      ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L282" class="LineNr">282 </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="L283" class="LineNr">283 </span>    <a href='003trace.cc.html#L298'>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="L284" class="LineNr">284 </span>  <span class="Delimiter">}</span>
+<span id="L285" class="LineNr">285 </span>
+<span id="L286" class="LineNr">286 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L311'>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="L287" class="LineNr">287 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span> &lt;&lt; FUNCTION &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Normal">FILE</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; LINE &lt;&lt; <span class="Constant">&quot;): <a href='011run.cc.html#L110'>line</a> [&quot;</span> &lt;&lt; <a href='003trace.cc.html#L73'>label</a> &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='003trace.cc.html#L74'>contents</a> &lt;&lt; <span class="Constant">&quot;] out of order in <a href='003trace.cc.html#L190'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L288" class="LineNr">288 </span>    <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L289" class="LineNr">289 </span>  <span class="Delimiter">}</span>
+<span id="L290" class="LineNr">290 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L291" class="LineNr">291 </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#L190'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L292" class="LineNr">292 </span>    <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>
+<span id="L293" class="LineNr">293 </span>  <span class="Delimiter">}</span>
+<span id="L294" class="LineNr">294 </span>  <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L296" class="LineNr">296 </span><span class="Delimiter">}</span>
+<span id="L297" class="LineNr">297 </span>
+<span id="L298" class="LineNr">298 </span><span class="Normal">void</span> <a href='003trace.cc.html#L298'>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="L299" class="LineNr">299 </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="L300" class="LineNr">300 </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="L301" class="LineNr">301 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L302" class="LineNr">302 </span>    *label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L303" class="LineNr">303 </span>    *contents = <a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Delimiter">}</span>
+<span id="L305" class="LineNr">305 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L306" class="LineNr">306 </span>    *label = <a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> pos<span class="Delimiter">));</span>
+<span id="L307" class="LineNr">307 </span>    *contents = <a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span>pos+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">)));</span>
+<span id="L308" class="LineNr">308 </span>  <span class="Delimiter">}</span>
+<span id="L309" class="LineNr">309 </span><span class="Delimiter">}</span>
+<span id="L310" class="LineNr">310 </span>
+<span id="L311" class="LineNr">311 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L311'>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="L312" class="LineNr">312 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L183'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L119'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L183'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L119'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L313" class="LineNr">313 </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="L314" class="LineNr">314 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> == <a href='003trace.cc.html#L380'>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="L315" class="LineNr">315 </span>  <span class="Delimiter">}</span>
+<span id="L316" class="LineNr">316 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L317" class="LineNr">317 </span><span class="Delimiter">}</span>
+<span id="L318" class="LineNr">318 </span>
+<span id="L319" class="LineNr">319 </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="L320" class="LineNr">320 </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="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="Normal">int</span> trace_count<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> string <a href='011run.cc.html#L110'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L324" class="LineNr">324 </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="L325" class="LineNr">325 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L326" class="LineNr">326 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L183'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L119'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L183'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L119'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L327" class="LineNr">327 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><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="L328" class="LineNr">328 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011run.cc.html#L110'>line</a> == <span class="Constant">&quot;&quot;</span> || <a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><a href='011run.cc.html#L110'>line</a><span class="Delimiter">)</span> == <a href='003trace.cc.html#L380'>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="L329" class="LineNr">329 </span>        ++result<span class="Delimiter">;</span>
+<span id="L330" class="LineNr">330 </span>    <span class="Delimiter">}</span>
+<span id="L331" class="LineNr">331 </span>  <span class="Delimiter">}</span>
+<span id="L332" class="LineNr">332 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L333" class="LineNr">333 </span><span class="Delimiter">}</span>
+<span id="L334" class="LineNr">334 </span>
+<span id="L335" class="LineNr">335 </span><span class="Normal">int</span> <a href='003trace.cc.html#L335'>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="L336" class="LineNr">336 </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="L337" class="LineNr">337 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L338" class="LineNr">338 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L183'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L119'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L183'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L119'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L339" class="LineNr">339 </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="L340" class="LineNr">340 </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#L380'>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#L380'>trim</a><span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span>
+<span id="L341" class="LineNr">341 </span>        ++result<span class="Delimiter">;</span>
+<span id="L342" class="LineNr">342 </span>    <span class="Delimiter">}</span>
+<span id="L343" class="LineNr">343 </span>  <span class="Delimiter">}</span>
+<span id="L344" class="LineNr">344 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L345" class="LineNr">345 </span><span class="Delimiter">}</span>
+<span id="L346" class="LineNr">346 </span>
+<span id="L347" class="LineNr">347 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> string <a href='011run.cc.html#L110'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L348" class="LineNr">348 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <a href='011run.cc.html#L110'>line</a><span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L349" class="LineNr">349 </span><span class="Delimiter">}</span>
+<span id="L350" class="LineNr">350 </span>
+<span id="L351" class="LineNr">351 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L352" class="LineNr">352 </span>  vector&lt;string&gt; tmp = <a href='003trace.cc.html#L371'>split_first</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
+<span id="L353" class="LineNr">353 </span>  <span class="Identifier">return</span> trace_doesnt_contain<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
+<span id="L354" class="LineNr">354 </span><span class="Delimiter">}</span>
+<span id="L355" class="LineNr">355 </span>
+<span id="L356" class="LineNr">356 </span>vector&lt;string&gt; <a href='003trace.cc.html#L356'>split</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L357" class="LineNr">357 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
+<span id="L358" class="LineNr">358 </span>  <span class="Normal">size_t</span> begin=<span class="Constant">0</span><span class="Delimiter">,</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L359" class="LineNr">359 </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="L360" class="LineNr">360 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L215'>end</a> == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L361" class="LineNr">361 </span>      result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> begin<span class="Delimiter">,</span> string::npos<span class="Delimiter">));</span>
+<span id="L362" class="LineNr">362 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L363" class="LineNr">363 </span>    <span class="Delimiter">}</span>
+<span id="L364" class="LineNr">364 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> begin<span class="Delimiter">,</span> end-begin<span class="Delimiter">));</span>
+<span id="L365" class="LineNr">365 </span>    begin = end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L366" class="LineNr">366 </span>    <a href='003trace.cc.html#L215'>end</a> = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">,</span> begin<span class="Delimiter">);</span>
+<span id="L367" class="LineNr">367 </span>  <span class="Delimiter">}</span>
+<span id="L368" class="LineNr">368 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L369" class="LineNr">369 </span><span class="Delimiter">}</span>
+<span id="L370" class="LineNr">370 </span>
+<span id="L371" class="LineNr">371 </span>vector&lt;string&gt; <a href='003trace.cc.html#L371'>split_first</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L372" class="LineNr">372 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
+<span id="L373" class="LineNr">373 </span>  <span class="Normal">size_t</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L374" class="LineNr">374 </span>  result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">));</span>
+<span id="L375" class="LineNr">375 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L215'>end</a> != string::npos<span class="Delimiter">)</span>
+<span id="L376" class="LineNr">376 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">),</span> string::npos<span class="Delimiter">));</span>
+<span id="L377" class="LineNr">377 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L378" class="LineNr">378 </span><span class="Delimiter">}</span>
+<span id="L379" class="LineNr">379 </span>
+<span id="L380" class="LineNr">380 </span>string <a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L381" class="LineNr">381 </span>  string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
+<span id="L382" class="LineNr">382 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>first != s<span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*first<span class="Delimiter">))</span>
+<span id="L383" class="LineNr">383 </span>    ++first<span class="Delimiter">;</span>
+<span id="L384" class="LineNr">384 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>first == s<span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L385" class="LineNr">385 </span>
+<span id="L386" class="LineNr">386 </span>  string::const_iterator last = --s<span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L387" class="LineNr">387 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>last != s<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*last<span class="Delimiter">))</span>
+<span id="L388" class="LineNr">388 </span>    --last<span class="Delimiter">;</span>
+<span id="L389" class="LineNr">389 </span>  ++last<span class="Delimiter">;</span>
+<span id="L390" class="LineNr">390 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>first<span class="Delimiter">,</span> last<span class="Delimiter">);</span>
+<span id="L391" class="LineNr">391 </span><span class="Delimiter">}</span>
+<span id="L392" class="LineNr">392 </span>
+<span id="L393" class="LineNr">393 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L394" class="LineNr">394 </span><span class="Comment">#include &lt;vector&gt;</span>
+<span id="L395" class="LineNr">395 </span><span class="Normal">using</span> std::vector<span class="Delimiter">;</span>
+<span id="L396" class="LineNr">396 </span><span class="Comment">#include &lt;list&gt;</span>
+<span id="L397" class="LineNr">397 </span><span class="Normal">using</span> std::list<span class="Delimiter">;</span>
+<span id="L398" class="LineNr">398 </span><span class="Comment">#include &lt;set&gt;</span>
+<span id="L399" class="LineNr">399 </span><span class="Normal">using</span> std::set<span class="Delimiter">;</span>
+<span id="L400" class="LineNr">400 </span>
+<span id="L401" class="LineNr">401 </span><span class="Comment">#include &lt;sstream&gt;</span>
+<span id="L402" class="LineNr">402 </span><span class="Normal">using</span> std::istringstream<span class="Delimiter">;</span>
+<span id="L403" class="LineNr">403 </span><span class="Normal">using</span> std::ostringstream<span class="Delimiter">;</span>
+<span id="L404" class="LineNr">404 </span>
+<span id="L405" class="LineNr">405 </span><span class="Comment">#include &lt;fstream&gt;</span>
+<span id="L406" class="LineNr">406 </span><span class="Normal">using</span> std::ifstream<span class="Delimiter">;</span>
+<span id="L407" class="LineNr">407 </span><span class="Normal">using</span> std::ofstream<span class="Delimiter">;</span>
+<span id="L408" class="LineNr">408 </span>
+<span id="L409" class="LineNr">409 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L410" class="LineNr">410 </span><span class="Comment">//: In future layers we'll use the depth field as follows:</span>
+<span id="L411" class="LineNr">411 </span><span class="Comment">//:</span>
+<span id="L412" class="LineNr">412 </span><span class="Comment">//: Errors will be depth 0.</span>
+<span id="L413" class="LineNr">413 </span><span class="Comment">//: Mu 'applications' will be able to use depths 1-100 as they like.</span>
+<span id="L414" class="LineNr">414 </span><span class="Comment">//: Primitive statements will occupy 101-9989</span>
+<span id="L415" class="LineNr">415 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> <a href='003trace.cc.html#L415'>Initial_callstack_depth</a> = <span class="Constant">101</span><span class="Delimiter">;</span>
+<span id="L416" class="LineNr">416 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> <a href='003trace.cc.html#L416'>Max_callstack_depth</a> = <span class="Constant">9989</span><span class="Delimiter">;</span>
+<span id="L417" class="LineNr">417 </span><span class="Comment">//: Finally, details of primitive Mu statements will occupy depth 9990-9999</span>
+<span id="L418" class="LineNr">418 </span><span class="Comment">//: (more on that later as well)</span>
+<span id="L419" class="LineNr">419 </span><span class="Comment">//:</span>
+<span id="L420" class="LineNr">420 </span><span class="Comment">//: This framework should help us hide some details at each level, mixing</span>
+<span id="L421" class="LineNr">421 </span><span class="Comment">//: static ideas like layers with the dynamic notion of call-stack depth.</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/003trace.test.cc.html b/html/subx/003trace.test.cc.html
index 72ec2c33..094ca159 100644
--- a/html/subx/003trace.test.cc.html
+++ b/html/subx/003trace.test.cc.html
@@ -57,66 +57,66 @@ if ('onhashchange' in window) {
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr">  1 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L1'>test_trace_check_compares</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L2" class="LineNr">  2 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L3" class="LineNr">  3 </span>  <a href='003trace.cc.html#L241'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L2" class="LineNr">  2 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L3" class="LineNr">  3 </span>  <a href='003trace.cc.html#L243'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer: foo&quot;</span><span class="Delimiter">);</span>
 <span id="L4" class="LineNr">  4 </span><span class="Delimiter">}</span>
 <span id="L5" class="LineNr">  5 </span>
 <span id="L6" class="LineNr">  6 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L6'>test_trace_check_ignores_other_layers</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L7" class="LineNr">  7 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L8" class="LineNr">  8 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L9" class="LineNr">  9 </span>  <a href='003trace.cc.html#L241'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
-<span id="L10" class="LineNr"> 10 </span>  <a href='003trace.cc.html#L261'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L7" class="LineNr">  7 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L8" class="LineNr">  8 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L9" class="LineNr">  9 </span>  <a href='003trace.cc.html#L243'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L10" class="LineNr"> 10 </span>  <a href='003trace.cc.html#L263'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2: foo&quot;</span><span class="Delimiter">);</span>
 <span id="L11" class="LineNr"> 11 </span><span class="Delimiter">}</span>
 <span id="L12" class="LineNr"> 12 </span>
 <span id="L13" class="LineNr"> 13 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L13'>test_trace_check_ignores_leading_whitespace</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L14" class="LineNr"> 14 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L14" class="LineNr"> 14 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L15" class="LineNr"> 15 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">too little whitespace</span><span class="Comment">*/</span><span class="Constant">&quot;foo&quot;</span><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L16" class="LineNr"> 16 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">too much whitespace</span><span class="Comment">*/</span><span class="Constant">&quot;  foo&quot;</span><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L17" class="LineNr"> 17 </span><span class="Delimiter">}</span>
 <span id="L18" class="LineNr"> 18 </span>
 <span id="L19" class="LineNr"> 19 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L19'>test_trace_check_ignores_other_lines</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L20" class="LineNr"> 20 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L241'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L20" class="LineNr"> 20 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L243'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
 <span id="L23" class="LineNr"> 23 </span><span class="Delimiter">}</span>
 <span id="L24" class="LineNr"> 24 </span>
 <span id="L25" class="LineNr"> 25 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L25'>test_trace_check_ignores_other_lines2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L26" class="LineNr"> 26 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L27" class="LineNr"> 27 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L28" class="LineNr"> 28 </span>  <a href='003trace.cc.html#L241'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: bar&quot;</span><span class="Delimiter">);</span>
+<span id="L26" class="LineNr"> 26 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L27" class="LineNr"> 27 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </span>  <a href='003trace.cc.html#L243'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: bar&quot;</span><span class="Delimiter">);</span>
 <span id="L29" class="LineNr"> 29 </span><span class="Delimiter">}</span>
 <span id="L30" class="LineNr"> 30 </span>
 <span id="L31" class="LineNr"> 31 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L31'>test_trace_ignores_trailing_whitespace</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L32" class="LineNr"> 32 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L33" class="LineNr"> 33 </span>  <a href='003trace.cc.html#L241'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L32" class="LineNr"> 32 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L33" class="LineNr"> 33 </span>  <a href='003trace.cc.html#L243'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
 <span id="L34" class="LineNr"> 34 </span><span class="Delimiter">}</span>
 <span id="L35" class="LineNr"> 35 </span>
 <span id="L36" class="LineNr"> 36 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L36'>test_trace_ignores_trailing_whitespace2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L37" class="LineNr"> 37 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo &quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L38" class="LineNr"> 38 </span>  <a href='003trace.cc.html#L241'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
+<span id="L37" class="LineNr"> 37 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo &quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L38" class="LineNr"> 38 </span>  <a href='003trace.cc.html#L243'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo&quot;</span><span class="Delimiter">);</span>
 <span id="L39" class="LineNr"> 39 </span><span class="Delimiter">}</span>
 <span id="L40" class="LineNr"> 40 </span>
 <span id="L41" class="LineNr"> 41 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L41'>test_trace_orders_across_layers</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L42" class="LineNr"> 42 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L43" class="LineNr"> 43 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L44" class="LineNr"> 44 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;qux&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L45" class="LineNr"> 45 </span>  <a href='003trace.cc.html#L241'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo^Dtest layer 2: bar^Dtest layer 1: qux^D&quot;</span><span class="Delimiter">);</span>
+<span id="L42" class="LineNr"> 42 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L43" class="LineNr"> 43 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L44" class="LineNr"> 44 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;qux&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L45" class="LineNr"> 45 </span>  <a href='003trace.cc.html#L243'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1: foo^Dtest layer 2: bar^Dtest layer 1: qux^D&quot;</span><span class="Delimiter">);</span>
 <span id="L46" class="LineNr"> 46 </span><span class="Delimiter">}</span>
 <span id="L47" class="LineNr"> 47 </span>
 <span id="L48" class="LineNr"> 48 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L48'>test_trace_supports_count</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L49" class="LineNr"> 49 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L50" class="LineNr"> 50 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L49" class="LineNr"> 49 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L50" class="LineNr"> 50 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L51" class="LineNr"> 51 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;foo&quot;</span><span class="Delimiter">),</span> <span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L52" class="LineNr"> 52 </span><span class="Delimiter">}</span>
 <span id="L53" class="LineNr"> 53 </span>
 <span id="L54" class="LineNr"> 54 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L54'>test_trace_supports_count2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L55" class="LineNr"> 55 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L56" class="LineNr"> 56 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L55" class="LineNr"> 55 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L56" class="LineNr"> 56 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;bar&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L57" class="LineNr"> 57 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">),</span> <span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L58" class="LineNr"> 58 </span><span class="Delimiter">}</span>
 <span id="L59" class="LineNr"> 59 </span>
 <span id="L60" class="LineNr"> 60 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L60'>test_trace_count_ignores_trailing_whitespace</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L61" class="LineNr"> 61 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L61" class="LineNr"> 61 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;foo</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L62" class="LineNr"> 62 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;foo&quot;</span><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L63" class="LineNr"> 63 </span><span class="Delimiter">}</span>
 <span id="L64" class="LineNr"> 64 </span>
@@ -131,26 +131,26 @@ if ('onhashchange' in window) {
 <span id="L73" class="LineNr"> 73 </span><span class="Comment">// can't check trace because trace methods call 'split'</span>
 <span id="L74" class="LineNr"> 74 </span>
 <span id="L75" class="LineNr"> 75 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L75'>test_split_returns_at_least_one_elem</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L76" class="LineNr"> 76 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L354'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
+<span id="L76" class="LineNr"> 76 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L356'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
 <span id="L77" class="LineNr"> 77 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L78" class="LineNr"> 78 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L79" class="LineNr"> 79 </span><span class="Delimiter">}</span>
 <span id="L80" class="LineNr"> 80 </span>
 <span id="L81" class="LineNr"> 81 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L81'>test_split_returns_entire_input_when_no_delim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L82" class="LineNr"> 82 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L354'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
+<span id="L82" class="LineNr"> 82 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L356'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
 <span id="L83" class="LineNr"> 83 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L84" class="LineNr"> 84 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;abc&quot;</span><span class="Delimiter">);</span>
 <span id="L85" class="LineNr"> 85 </span><span class="Delimiter">}</span>
 <span id="L86" class="LineNr"> 86 </span>
 <span id="L87" class="LineNr"> 87 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L87'>test_split_works</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L88" class="LineNr"> 88 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L354'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,def&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
+<span id="L88" class="LineNr"> 88 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L356'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,def&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
 <span id="L89" class="LineNr"> 89 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L90" class="LineNr"> 90 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;abc&quot;</span><span class="Delimiter">);</span>
 <span id="L91" class="LineNr"> 91 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">&quot;def&quot;</span><span class="Delimiter">);</span>
 <span id="L92" class="LineNr"> 92 </span><span class="Delimiter">}</span>
 <span id="L93" class="LineNr"> 93 </span>
 <span id="L94" class="LineNr"> 94 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L94'>test_split_works2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L95" class="LineNr"> 95 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L354'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,def,ghi&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
+<span id="L95" class="LineNr"> 95 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L356'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,def,ghi&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,&quot;</span><span class="Delimiter">);</span>
 <span id="L96" class="LineNr"> 96 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">3</span><span class="Delimiter">);</span>
 <span id="L97" class="LineNr"> 97 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;abc&quot;</span><span class="Delimiter">);</span>
 <span id="L98" class="LineNr"> 98 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">&quot;def&quot;</span><span class="Delimiter">);</span>
@@ -158,7 +158,7 @@ if ('onhashchange' in window) {
 <span id="L100" class="LineNr">100 </span><span class="Delimiter">}</span>
 <span id="L101" class="LineNr">101 </span>
 <span id="L102" class="LineNr">102 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L102'>test_split_handles_multichar_delim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L103" class="LineNr">103 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L354'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,,def,,ghi&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,,&quot;</span><span class="Delimiter">);</span>
+<span id="L103" class="LineNr">103 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L356'>split</a><span class="Delimiter">(</span><span class="Constant">&quot;abc,,def,,ghi&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;,,&quot;</span><span class="Delimiter">);</span>
 <span id="L104" class="LineNr">104 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">3</span><span class="Delimiter">);</span>
 <span id="L105" class="LineNr">105 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">&quot;abc&quot;</span><span class="Delimiter">);</span>
 <span id="L106" class="LineNr">106 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">&quot;def&quot;</span><span class="Delimiter">);</span>
@@ -166,19 +166,19 @@ if ('onhashchange' in window) {
 <span id="L108" class="LineNr">108 </span><span class="Delimiter">}</span>
 <span id="L109" class="LineNr">109 </span>
 <span id="L110" class="LineNr">110 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L110'>test_trim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L111" class="LineNr">111 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L112" class="LineNr">112 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L113" class="LineNr">113 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L114" class="LineNr">114 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L115" class="LineNr">115 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L116" class="LineNr">116 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L117" class="LineNr">117 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  ab&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
-<span id="L118" class="LineNr">118 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L119" class="LineNr">119 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L120" class="LineNr">120 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;ab  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
-<span id="L121" class="LineNr">121 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; a &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L122" class="LineNr">122 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  a  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
-<span id="L123" class="LineNr">123 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L378'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  ab  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
+<span id="L111" class="LineNr">111 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L112" class="LineNr">112 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L113" class="LineNr">113 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L114" class="LineNr">114 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L115" class="LineNr">115 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  a&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L117" class="LineNr">117 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  ab&quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
+<span id="L118" class="LineNr">118 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L119" class="LineNr">119 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;a  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L120" class="LineNr">120 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;ab  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
+<span id="L121" class="LineNr">121 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot; a &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L122" class="LineNr">122 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  a  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;a&quot;</span><span class="Delimiter">);</span>
+<span id="L123" class="LineNr">123 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L380'>trim</a><span class="Delimiter">(</span><span class="Constant">&quot;  ab  &quot;</span><span class="Delimiter">),</span> <span class="Constant">&quot;ab&quot;</span><span class="Delimiter">);</span>
 <span id="L124" class="LineNr">124 </span><span class="Delimiter">}</span>
 </pre>
 </body>
diff --git a/html/subx/010core.cc.html b/html/subx/010core.cc.html
deleted file mode 100644
index 1a41f0d6..00000000
--- a/html/subx/010core.cc.html
+++ /dev/null
@@ -1,313 +0,0 @@
-<!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/010core.cc</title>
-<meta name="Generator" content="Vim/7.4">
-<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; }
-.Constant { color: #00a0a0; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.SalientComment { color: #00ffff; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.PreProc { color: #800080; }
-.traceContains { color: #008000; }
-.cSpecial { 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="SalientComment">//:: simulated x86 registers; just a subset</span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment">//:    assume segment registers are hard-coded to 0</span>
-<span id="L3" class="LineNr">  3 </span><span class="Comment">//:    no floating-point, MMX, etc. yet</span>
-<span id="L4" class="LineNr">  4 </span>
-<span id="L5" class="LineNr">  5 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L6" class="LineNr">  6 </span><span class="Normal">enum</span> <span class="Delimiter">{</span>
-<span id="L7" class="LineNr">  7 </span>  <a href='010core.cc.html#L7'>EAX</a><span class="Delimiter">,</span>
-<span id="L8" class="LineNr">  8 </span>  <a href='010core.cc.html#L8'>ECX</a><span class="Delimiter">,</span>
-<span id="L9" class="LineNr">  9 </span>  <a href='010core.cc.html#L9'>EDX</a><span class="Delimiter">,</span>
-<span id="L10" class="LineNr"> 10 </span>  <a href='010core.cc.html#L10'>EBX</a><span class="Delimiter">,</span>
-<span id="L11" class="LineNr"> 11 </span>  <a href='010core.cc.html#L11'>ESP</a><span class="Delimiter">,</span>
-<span id="L12" class="LineNr"> 12 </span>  <a href='010core.cc.html#L12'>EBP</a><span class="Delimiter">,</span>
-<span id="L13" class="LineNr"> 13 </span>  <a href='010core.cc.html#L13'>ESI</a><span class="Delimiter">,</span>
-<span id="L14" class="LineNr"> 14 </span>  <a href='010core.cc.html#L14'>EDI</a><span class="Delimiter">,</span>
-<span id="L15" class="LineNr"> 15 </span>  <a href='010core.cc.html#L15'>NUM_INT_REGISTERS</a><span class="Delimiter">,</span>
-<span id="L16" class="LineNr"> 16 </span><span class="Delimiter">};</span>
-<span id="L17" class="LineNr"> 17 </span><span class="Normal">union</span> <a href='010core.cc.html#L17'>reg</a> <span class="Delimiter">{</span>
-<span id="L18" class="LineNr"> 18 </span>  <span class="Normal">int32_t</span> i<span class="Delimiter">;</span>
-<span id="L19" class="LineNr"> 19 </span>  <span class="Normal">uint32_t</span> u<span class="Delimiter">;</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Delimiter">};</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L22" class="LineNr"> 22 </span><a href='010core.cc.html#L17'>reg</a> Reg[NUM_INT_REGISTERS] = <span class="Delimiter">{</span> <span class="Delimiter">{</span><span class="Constant">0</span><span class="Delimiter">}</span> <span class="Delimiter">};</span>
-<span id="L23" class="LineNr"> 23 </span><span class="Normal">uint32_t</span> <a href='010core.cc.html#L23'>EIP</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L24" class="LineNr"> 24 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L25" class="LineNr"> 25 </span>bzero<span class="Delimiter">(</span><a href='010core.cc.html#L22'>Reg</a><span class="Delimiter">,</span> <span class="Normal">sizeof</span><span class="Delimiter">(</span><a href='010core.cc.html#L22'>Reg</a><span class="Delimiter">));</span>
-<span id="L26" class="LineNr"> 26 </span><a href='010core.cc.html#L23'>EIP</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L27" class="LineNr"> 27 </span>
-<span id="L28" class="LineNr"> 28 </span><span class="SalientComment">//:: simulated flag registers; just a subset that we care about</span>
-<span id="L29" class="LineNr"> 29 </span>
-<span id="L30" class="LineNr"> 30 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Normal">bool</span> SF = <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// sign flag</span>
-<span id="L32" class="LineNr"> 32 </span><span class="Normal">bool</span> ZF = <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// zero flag</span>
-<span id="L33" class="LineNr"> 33 </span><span class="Normal">bool</span> <a href='010core.cc.html#L33'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// overflow flag</span>
-<span id="L34" class="LineNr"> 34 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L35" class="LineNr"> 35 </span>SF = ZF = <a href='010core.cc.html#L33'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L36" class="LineNr"> 36 </span>
-<span id="L37" class="LineNr"> 37 </span><span class="Comment">//: how the flag registers are updated after each instruction</span>
-<span id="L38" class="LineNr"> 38 </span>
-<span id="L39" class="LineNr"> 39 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L40" class="LineNr"> 40 </span><span class="Comment">// Combine 'arg1' and 'arg2' with arithmetic operation 'op' and store the</span>
-<span id="L41" class="LineNr"> 41 </span><span class="Comment">// result in 'arg1', then update flags.</span>
-<span id="L42" class="LineNr"> 42 </span><span class="Comment">// beware: no side-effects in args</span>
-<span id="L43" class="LineNr"> 43 </span><span class="PreProc">#define BINARY_ARITHMETIC_OP(op</span><span class="Delimiter">,</span><span class="PreProc"> arg1</span><span class="Delimiter">,</span><span class="PreProc"> arg2) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
-<span id="L44" class="LineNr"> 44 </span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be signed </span><span class="Comment">*/</span><span class="PreProc"> \</span>
-<span id="L45" class="LineNr"> 45 </span><span class="PreProc">  </span><span class="Normal">int64_t</span><span class="PreProc"> tmp = arg1 op arg2</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L46" class="LineNr"> 46 </span><span class="PreProc">  arg1 = arg1 op arg2</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L47" class="LineNr"> 47 </span><span class="PreProc">  trace(</span><span class="Constant">2</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;run&quot;</span><span class="PreProc">) &lt;&lt; </span><span class="Constant">&quot;storing 0x&quot;</span><span class="PreProc"> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end()</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L48" class="LineNr"> 48 </span><span class="PreProc">  SF = (arg1 &lt; </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L49" class="LineNr"> 49 </span><span class="PreProc">  ZF = (arg1 == </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L50" class="LineNr"> 50 </span><span class="PreProc">  <a href='010core.cc.html#L33'>OF</a> = (arg1 != tmp)</span><span class="Delimiter">;</span><span class="PreProc"> \</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="Comment">// Combine 'arg1' and 'arg2' with bitwise operation 'op' and store the result</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Comment">// in 'arg1', then update flags.</span>
-<span id="L55" class="LineNr"> 55 </span><span class="PreProc">#define BINARY_BITWISE_OP(op</span><span class="Delimiter">,</span><span class="PreProc"> arg1</span><span class="Delimiter">,</span><span class="PreProc"> arg2) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
-<span id="L56" class="LineNr"> 56 </span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be unsigned </span><span class="Comment">*/</span><span class="PreProc"> \</span>
-<span id="L57" class="LineNr"> 57 </span><span class="PreProc">  arg1 = arg1 op arg2</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L58" class="LineNr"> 58 </span><span class="PreProc">  trace(</span><span class="Constant">2</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;run&quot;</span><span class="PreProc">) &lt;&lt; </span><span class="Constant">&quot;storing 0x&quot;</span><span class="PreProc"> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end()</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L59" class="LineNr"> 59 </span><span class="PreProc">  SF = (arg1 &gt;&gt; </span><span class="Constant">31</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L60" class="LineNr"> 60 </span><span class="PreProc">  ZF = (arg1 == </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L61" class="LineNr"> 61 </span><span class="PreProc">  <a href='010core.cc.html#L33'>OF</a> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</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">//:: simulated RAM</span>
-<span id="L65" class="LineNr"> 65 </span>
-<span id="L66" class="LineNr"> 66 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L67" class="LineNr"> 67 </span>vector&lt;<span class="Normal">uint8_t</span>&gt; <a href='010core.cc.html#L67'>Mem</a><span class="Delimiter">;</span>
-<span id="L68" class="LineNr"> 68 </span><span class="Normal">uint32_t</span> <a href='010core.cc.html#L68'>End_of_program</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L69" class="LineNr"> 69 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L70" class="LineNr"> 70 </span><a href='010core.cc.html#L67'>Mem</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
-<span id="L71" class="LineNr"> 71 </span><a href='010core.cc.html#L67'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1024</span><span class="Delimiter">);</span>
-<span id="L72" class="LineNr"> 72 </span><a href='010core.cc.html#L68'>End_of_program</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L74" class="LineNr"> 74 </span><span class="Comment">// depends on Mem being laid out contiguously (so you can't use a map, etc.)</span>
-<span id="L75" class="LineNr"> 75 </span><span class="Comment">// and on the host also being little-endian</span>
-<span id="L76" class="LineNr"> 76 </span><span class="PreProc">#define SET_WORD_IN_MEM(addr</span><span class="Delimiter">,</span><span class="PreProc"> val)  *</span><span class="Normal">reinterpret_cast</span><span class="PreProc">&lt;</span><span class="Normal">int32_t</span><span class="PreProc">*&gt;(&amp;Mem</span><span class="Delimiter">.</span><span class="PreProc">at(addr)) = val</span><span class="Delimiter">;</span>
-<span id="L77" class="LineNr"> 77 </span>
-<span id="L78" class="LineNr"> 78 </span><span class="SalientComment">//:: core interpreter loop</span>
-<span id="L79" class="LineNr"> 79 </span>
-<span id="L80" class="LineNr"> 80 </span><span class="Delimiter">:(scenario add_imm32_to_eax)</span>
-<span id="L81" class="LineNr"> 81 </span><span class="Comment"># In scenarios, programs are a series of hex bytes, each (variable-length)</span>
-<span id="L82" class="LineNr"> 82 </span><span class="Comment"># instruction on one line.</span>
-<span id="L83" class="LineNr"> 83 </span>#
-<span id="L84" class="LineNr"> 84 </span><span class="Comment"># x86 instructions consist of the following parts (see cheatsheet.pdf):</span>
-<span id="L85" class="LineNr"> 85 </span><span class="Comment">#   opcode        ModR/M                    SIB                   displacement    immediate</span>
-<span id="L86" class="LineNr"> 86 </span><span class="Comment">#   instruction   mod, reg, Reg/Mem bits    scale, index, base</span>
-<span id="L87" class="LineNr"> 87 </span><span class="Comment">#   1-3 bytes     0/1 byte                  0/1 byte              0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L88" class="LineNr"> 88 </span>    <span class="PreProc">0</span><span class="Constant">5</span>                                                                            0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to EAX</span>
-<span id="L89" class="LineNr"> 89 </span><span class="Comment"># All hex bytes must be exactly 2 characters each. No '0x' prefixes.</span>
-<span id="L90" class="LineNr"> 90 </span><span class="traceContains">+load: 1 -&gt; 05</span>
-<span id="L91" class="LineNr"> 91 </span><span class="traceContains">+load: 2 -&gt; 0a</span>
-<span id="L92" class="LineNr"> 92 </span><span class="traceContains">+load: 3 -&gt; 0b</span>
-<span id="L93" class="LineNr"> 93 </span><span class="traceContains">+load: 4 -&gt; 0c</span>
-<span id="L94" class="LineNr"> 94 </span><span class="traceContains">+load: 5 -&gt; 0d</span>
-<span id="L95" class="LineNr"> 95 </span><span class="traceContains">+run: add <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a to <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L96" class="LineNr"> 96 </span><span class="traceContains">+run: storing 0x0d0c0b0a</span>
-<span id="L97" class="LineNr"> 97 </span>
-<span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(code)</span>
-<span id="L99" class="LineNr"> 99 </span><span class="Comment">// helper for tests: load a program into memory from a textual representation</span>
-<span id="L100" class="LineNr">100 </span><span class="Comment">// of its bytes, and run it</span>
-<span id="L101" class="LineNr">101 </span><span class="Normal">void</span> <a href='010core.cc.html#L101'>run</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L102" class="LineNr">102 </span>  <a href='010core.cc.html#L154'>load_program</a><span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
-<span id="L103" class="LineNr">103 </span>  <a href='010core.cc.html#L23'>EIP</a> = <span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// preserve null pointer</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010core.cc.html#L23'>EIP</a> &lt; <a href='010core.cc.html#L68'>End_of_program</a><span class="Delimiter">)</span>
-<span id="L105" class="LineNr">105 </span>    <a href='010core.cc.html#L109'>run_one_instruction</a><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="Comment">// skeleton of how x86 instructions are decoded</span>
-<span id="L109" class="LineNr">109 </span><span class="Normal">void</span> <a href='010core.cc.html#L109'>run_one_instruction</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L110" class="LineNr">110 </span>  <span class="Normal">uint8_t</span> op=<span class="Constant">0</span><span class="Delimiter">,</span> op2=<span class="Constant">0</span><span class="Delimiter">,</span> op3=<span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L111" class="LineNr">111 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;inst: 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; <a href='010core.cc.html#L23'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L112" class="LineNr">112 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>op = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L113" class="LineNr">113 </span>  <span class="Normal">case</span> <span class="Constant">0xf4</span>:  <span class="Comment">// hlt</span>
-<span id="L114" class="LineNr">114 </span>    <a href='010core.cc.html#L23'>EIP</a> = <a href='010core.cc.html#L68'>End_of_program</a><span class="Delimiter">;</span>
-<span id="L115" class="LineNr">115 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L116" class="LineNr">116 </span>  <span class="Comment">// our first opcode</span>
-<span id="L117" class="LineNr">117 </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="L118" class="LineNr">118 </span>    <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L119" class="LineNr">119 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to <a href='010core.cc.html#L17'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L120" class="LineNr">120 </span>    <a href='010core.cc.html#L43'>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="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 Single-Byte Opcodes</span>
-<span id="L124" class="LineNr">124 </span>  <span class="Normal">case</span> <span class="Constant">0x0f</span>:
-<span id="L125" class="LineNr">125 </span>    <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L126" class="LineNr">126 </span>    <span class="Comment">// End Two-Byte Opcodes Starting With 0f</span>
-<span id="L127" class="LineNr">127 </span>    <span class="Normal">default</span>:
-<span id="L128" class="LineNr">128 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after 0f: &quot;</span> &lt;&lt; <a href='010core.cc.html#L243'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L246'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L129" class="LineNr">129 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L130" class="LineNr">130 </span>    <span class="Delimiter">}</span>
-<span id="L131" class="LineNr">131 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L132" class="LineNr">132 </span>  <span class="Normal">case</span> <span class="Constant">0xf3</span>:
-<span id="L133" class="LineNr">133 </span>    <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L134" class="LineNr">134 </span>    <span class="Comment">// End Two-Byte Opcodes Starting With f3</span>
-<span id="L135" class="LineNr">135 </span>    <span class="Normal">case</span> <span class="Constant">0x0f</span>:
-<span id="L136" class="LineNr">136 </span>      <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L137" class="LineNr">137 </span>      <span class="Comment">// End Three-Byte Opcodes Starting With f3 0f</span>
-<span id="L138" class="LineNr">138 </span>      <span class="Normal">default</span>:
-<span id="L139" class="LineNr">139 </span>        cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f3 0f: &quot;</span> &lt;&lt; <a href='010core.cc.html#L243'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L246'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L140" class="LineNr">140 </span>        exit<span class="Delimiter">(</span><span class="Constant">1</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="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L143" class="LineNr">143 </span>    <span class="Normal">default</span>:
-<span id="L144" class="LineNr">144 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f3: &quot;</span> &lt;&lt; <a href='010core.cc.html#L243'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L246'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L145" class="LineNr">145 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</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="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Normal">default</span>:
-<span id="L149" class="LineNr">149 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized opcode: &quot;</span> &lt;&lt; <a href='010core.cc.html#L243'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L246'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L150" class="LineNr">150 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L151" class="LineNr">151 </span>  <span class="Delimiter">}</span>
-<span id="L152" class="LineNr">152 </span><span class="Delimiter">}</span>
-<span id="L153" class="LineNr">153 </span>
-<span id="L154" class="LineNr">154 </span><span class="Normal">void</span> <a href='010core.cc.html#L154'>load_program</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L155" class="LineNr">155 </span>  <span class="Normal">uint32_t</span> addr = <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L156" class="LineNr">156 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
-<span id="L157" class="LineNr">157 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L188'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L159" class="LineNr">159 </span>    <span class="Normal">char</span> c1 = <a href='010core.cc.html#L177'>next_hex_byte</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L160" class="LineNr">160 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c1 == <span class="cSpecial">'\0'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L161" class="LineNr">161 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L162" class="LineNr">162 </span>      <a href='003trace.cc.html#L167'>raise</a> &lt;&lt; <span class="Constant">&quot;input program truncated mid-byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L163" class="LineNr">163 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L164" class="LineNr">164 </span>    <span class="Delimiter">}</span>
-<span id="L165" class="LineNr">165 </span>    <span class="Normal">char</span> c2 = <a href='010core.cc.html#L177'>next_hex_byte</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L166" class="LineNr">166 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c2 == <span class="cSpecial">'\0'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L167" class="LineNr">167 </span>      <a href='003trace.cc.html#L167'>raise</a> &lt;&lt; <span class="Constant">&quot;input program truncated mid-byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L168" class="LineNr">168 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L169" class="LineNr">169 </span>    <span class="Delimiter">}</span>
-<span id="L170" class="LineNr">170 </span>    <a href='010core.cc.html#L67'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>addr<span class="Delimiter">)</span> = <a href='010core.cc.html#L204'>to_byte</a><span class="Delimiter">(</span>c1<span class="Delimiter">,</span> c2<span class="Delimiter">);</span>
-<span id="L171" class="LineNr">171 </span>    <a href='003trace.cc.html#L160'>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; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010core.cc.html#L243'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L246'>NUM</a><span class="Delimiter">(</span><a href='010core.cc.html#L67'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>addr<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L172" class="LineNr">172 </span>    addr++<span class="Delimiter">;</span>
-<span id="L173" class="LineNr">173 </span>  <span class="Delimiter">}</span>
-<span id="L174" class="LineNr">174 </span>  <a href='010core.cc.html#L68'>End_of_program</a> = addr<span class="Delimiter">;</span>
-<span id="L175" class="LineNr">175 </span><span class="Delimiter">}</span>
-<span id="L176" class="LineNr">176 </span>
-<span id="L177" class="LineNr">177 </span><span class="Normal">char</span> <a href='010core.cc.html#L177'>next_hex_byte</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L178" class="LineNr">178 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L188'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L179" class="LineNr">179 </span>    <span class="Normal">char</span> c = <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
-<span id="L180" class="LineNr">180 </span>    in &gt;&gt; c<span class="Delimiter">;</span>
-<span id="L181" class="LineNr">181 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">' '</span> || c == <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L182" class="LineNr">182 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span>c == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L183" class="LineNr">183 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L188'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L184" class="LineNr">184 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
-<span id="L185" class="LineNr">185 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L186" class="LineNr">186 </span>          in &gt;&gt; c<span class="Delimiter">;</span>
-<span id="L187" class="LineNr">187 </span>          <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L188" class="LineNr">188 </span>        <span class="Delimiter">}</span>
-<span id="L189" class="LineNr">189 </span>      <span class="Delimiter">}</span>
-<span id="L190" class="LineNr">190 </span>    <span class="Delimiter">}</span>
-<span id="L191" class="LineNr">191 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="cSpecial">'\0'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c<span class="Delimiter">;</span>
-<span id="L192" class="LineNr">192 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'0'</span> &amp;&amp; c &lt;= <span class="Constant">'9'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c<span class="Delimiter">;</span>
-<span id="L193" class="LineNr">193 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'a'</span> &amp;&amp; c &lt;= <span class="Constant">'f'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c<span class="Delimiter">;</span>
-<span id="L194" class="LineNr">194 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'A'</span> &amp;&amp; c &lt;= <span class="Constant">'F'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> tolower<span class="Delimiter">(</span>c<span class="Delimiter">);</span>
-<span id="L195" class="LineNr">195 </span>    <span class="Comment">// disallow any non-hex characters, including a '0x' prefix</span>
-<span id="L196" class="LineNr">196 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>c<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L197" class="LineNr">197 </span>      <a href='003trace.cc.html#L167'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid non-hex character &quot;</span> &lt;&lt; <a href='010core.cc.html#L246'>NUM</a><span class="Delimiter">(</span>c<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L198" class="LineNr">198 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L199" class="LineNr">199 </span>    <span class="Delimiter">}</span>
-<span id="L200" class="LineNr">200 </span>  <span class="Delimiter">}</span>
-<span id="L201" class="LineNr">201 </span>  <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
-<span id="L202" class="LineNr">202 </span><span class="Delimiter">}</span>
-<span id="L203" class="LineNr">203 </span>
-<span id="L204" class="LineNr">204 </span><span class="Normal">uint8_t</span> <a href='010core.cc.html#L204'>to_byte</a><span class="Delimiter">(</span><span class="Normal">char</span> hex_byte1<span class="Delimiter">,</span> <span class="Normal">char</span> hex_byte2<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L205" class="LineNr">205 </span>  <span class="Identifier">return</span> <a href='010core.cc.html#L207'>to_hex_num</a><span class="Delimiter">(</span>hex_byte1<span class="Delimiter">)</span>*<span class="Constant">16</span> + <a href='010core.cc.html#L207'>to_hex_num</a><span class="Delimiter">(</span>hex_byte2<span class="Delimiter">);</span>
-<span id="L206" class="LineNr">206 </span><span class="Delimiter">}</span>
-<span id="L207" class="LineNr">207 </span><span class="Normal">uint8_t</span> <a href='010core.cc.html#L207'>to_hex_num</a><span class="Delimiter">(</span><span class="Normal">char</span> c<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L208" class="LineNr">208 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'0'</span> &amp;&amp; c &lt;= <span class="Constant">'9'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c - <span class="Constant">'0'</span><span class="Delimiter">;</span>
-<span id="L209" class="LineNr">209 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'a'</span> &amp;&amp; c &lt;= <span class="Constant">'f'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c - <span class="Constant">'a'</span> + <span class="Constant">10</span><span class="Delimiter">;</span>
-<span id="L210" class="LineNr">210 </span>  assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
-<span id="L211" class="LineNr">211 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L212" class="LineNr">212 </span><span class="Delimiter">}</span>
-<span id="L213" class="LineNr">213 </span>
-<span id="L214" class="LineNr">214 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span> <a href='010core.cc.html#L214'>next</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Identifier">return</span> <a href='010core.cc.html#L67'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>EIP++<span class="Delimiter">);</span>
-<span id="L216" class="LineNr">216 </span><span class="Delimiter">}</span>
-<span id="L217" class="LineNr">217 </span>
-<span id="L218" class="LineNr">218 </span><span class="Comment">// read a 32-bit immediate in little-endian order from the instruction stream</span>
-<span id="L219" class="LineNr">219 </span><span class="Normal">int32_t</span> <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L220" class="LineNr">220 </span>  <span class="Normal">int32_t</span> result = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L221" class="LineNr">221 </span>  result |= <span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
-<span id="L222" class="LineNr">222 </span>  result |= <span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
-<span id="L223" class="LineNr">223 </span>  result |= <span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">24</span><span class="Delimiter">);</span>
-<span id="L224" class="LineNr">224 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L225" class="LineNr">225 </span><span class="Delimiter">}</span>
-<span id="L226" class="LineNr">226 </span>
-<span id="L227" class="LineNr">227 </span>string <a href='010core.cc.html#L227'>rname</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L228" class="LineNr">228 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L229" class="LineNr">229 </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="L230" class="LineNr">230 </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="L231" class="LineNr">231 </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="L232" class="LineNr">232 </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="L233" class="LineNr">233 </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="L234" class="LineNr">234 </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="L235" class="LineNr">235 </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="L236" class="LineNr">236 </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="L237" class="LineNr">237 </span>  <span class="Normal">default</span>: <a href='003trace.cc.html#L167'>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#L184'>end</a><span class="Delimiter">();</span>  <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</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="Delimiter">}</span>
-<span id="L240" class="LineNr">240 </span>
-<span id="L241" class="LineNr">241 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L242" class="LineNr">242 </span><span class="PreProc">#include </span><span class="Constant">&lt;iomanip&gt;</span>
-<span id="L243" class="LineNr">243 </span><span class="PreProc">#define HEXBYTE  std::hex &lt;&lt; std::setw(</span><span class="Constant">2</span><span class="PreProc">) &lt;&lt; std::setfill(</span><span class="Constant">'0'</span><span class="PreProc">)</span>
-<span id="L244" class="LineNr">244 </span><span class="PreProc">#define HEXWORD  std::hex &lt;&lt; std::setw(</span><span class="Constant">8</span><span class="PreProc">) &lt;&lt; std::setfill(</span><span class="Constant">'0'</span><span class="PreProc">)</span>
-<span id="L245" class="LineNr">245 </span><span class="Comment">// ugly that iostream doesn't print uint8_t as an integer</span>
-<span id="L246" class="LineNr">246 </span><span class="PreProc">#define NUM(X) </span><span class="Normal">static_cast</span><span class="PreProc">&lt;</span><span class="Normal">int</span><span class="PreProc">&gt;(X)</span>
-<span id="L247" class="LineNr">247 </span><span class="PreProc">#include </span><span class="Constant">&lt;stdint.h&gt;</span>
-</pre>
-</body>
-</html>
-<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/010vm.cc.html b/html/subx/010vm.cc.html
index 3c1aa5f3..1e5d5d87 100644
--- a/html/subx/010vm.cc.html
+++ b/html/subx/010vm.cc.html
@@ -131,7 +131,7 @@ if ('onhashchange' in window) {
 <span id="L70" class="LineNr"> 70 </span>  <span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be signed </span><span class="Comment">*/</span> \
 <span id="L71" class="LineNr"> 71 </span>  <span class="Normal">int64_t</span> tmp = arg1 op arg2<span class="Delimiter">;</span> \
 <span id="L72" class="LineNr"> 72 </span>  arg1 = arg1 op arg2<span class="Delimiter">;</span> \
-<span id="L73" class="LineNr"> 73 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span> \
+<span id="L73" class="LineNr"> 73 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span> \
 <span id="L74" class="LineNr"> 74 </span>  SF = <span class="Delimiter">(</span>arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span> \
 <span id="L75" class="LineNr"> 75 </span>  ZF = <span class="Delimiter">(</span>arg1 == <span class="Constant">0</span><span class="Delimiter">);</span> \
 <span id="L76" class="LineNr"> 76 </span>  <a href='010vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>arg1 != tmp<span class="Delimiter">);</span> \
@@ -142,7 +142,7 @@ if ('onhashchange' in window) {
 <span id="L81" class="LineNr"> 81 </span><span class="Comment">#define BINARY_BITWISE_OP(op, arg1, arg2) { \</span>
 <span id="L82" class="LineNr"> 82 </span>  <span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be unsigned </span><span class="Comment">*/</span> \
 <span id="L83" class="LineNr"> 83 </span>  arg1 = arg1 op arg2<span class="Delimiter">;</span> \
-<span id="L84" class="LineNr"> 84 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span> \
+<span id="L84" class="LineNr"> 84 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span> \
 <span id="L85" class="LineNr"> 85 </span>  SF = <span class="Delimiter">(</span>arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span> \
 <span id="L86" class="LineNr"> 86 </span>  ZF = <span class="Delimiter">(</span>arg1 == <span class="Constant">0</span><span class="Delimiter">);</span> \
 <span id="L87" class="LineNr"> 87 </span>  <a href='010vm.cc.html#L59'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
@@ -207,89 +207,100 @@ if ('onhashchange' in window) {
 <span id="L146" class="LineNr">146 </span><span class="Comment">// skeleton of how x86 instructions are decoded</span>
 <span id="L147" class="LineNr">147 </span><span class="Normal">void</span> <a href='010vm.cc.html#L147'>run_one_instruction</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L148" class="LineNr">148 </span>  <span class="Normal">uint8_t</span> op=<span class="Constant">0</span><span class="Delimiter">,</span> op2=<span class="Constant">0</span><span class="Delimiter">,</span> op3=<span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L149" class="LineNr">149 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;inst: 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; <a href='010vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L150" class="LineNr">150 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;inst: 0x&quot; &lt;&lt; EIP &lt;&lt; '\n';</span>
-<span id="L151" class="LineNr">151 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>op = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L152" class="LineNr">152 </span>  <span class="Normal">case</span> <span class="Constant">0xf4</span>:  <span class="Comment">// hlt</span>
-<span id="L153" class="LineNr">153 </span>    <a href='010vm.cc.html#L29'>EIP</a> = <a href='010vm.cc.html#L95'>End_of_program</a><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="Comment">// End Single-Byte Opcodes</span>
-<span id="L156" class="LineNr">156 </span>  <span class="Normal">case</span> <span class="Constant">0x0f</span>:
-<span id="L157" class="LineNr">157 </span>    <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L158" class="LineNr">158 </span>    <span class="Comment">// End Two-Byte Opcodes Starting With 0f</span>
-<span id="L159" class="LineNr">159 </span>    <span class="Normal">default</span>:
-<span id="L160" class="LineNr">160 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after 0f: &quot;</span> &lt;&lt; <a href='010vm.cc.html#L227'>HEXBYTE</a> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L161" class="LineNr">161 </span>      <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L162" class="LineNr">162 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L163" class="LineNr">163 </span>    <span class="Delimiter">}</span>
-<span id="L164" class="LineNr">164 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L165" class="LineNr">165 </span>  <span class="Normal">case</span> <span class="Constant">0xf3</span>:
-<span id="L166" class="LineNr">166 </span>    <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L167" class="LineNr">167 </span>    <span class="Comment">// End Two-Byte Opcodes Starting With f3</span>
-<span id="L168" class="LineNr">168 </span>    <span class="Normal">case</span> <span class="Constant">0x0f</span>:
-<span id="L169" class="LineNr">169 </span>      <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L170" class="LineNr">170 </span>      <span class="Comment">// End Three-Byte Opcodes Starting With f3 0f</span>
-<span id="L171" class="LineNr">171 </span>      <span class="Normal">default</span>:
-<span id="L172" class="LineNr">172 </span>        cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f3 0f: &quot;</span> &lt;&lt; <a href='010vm.cc.html#L227'>HEXBYTE</a> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L173" class="LineNr">173 </span>        <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L174" class="LineNr">174 </span>        exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L175" class="LineNr">175 </span>      <span class="Delimiter">}</span>
-<span id="L176" class="LineNr">176 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L177" class="LineNr">177 </span>    <span class="Normal">default</span>:
-<span id="L178" class="LineNr">178 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f3: &quot;</span> &lt;&lt; <a href='010vm.cc.html#L227'>HEXBYTE</a> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L179" class="LineNr">179 </span>      <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L180" class="LineNr">180 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L181" class="LineNr">181 </span>    <span class="Delimiter">}</span>
-<span id="L182" class="LineNr">182 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L183" class="LineNr">183 </span>  <span class="Normal">default</span>:
-<span id="L184" class="LineNr">184 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized opcode: &quot;</span> &lt;&lt; <a href='010vm.cc.html#L227'>HEXBYTE</a> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L185" class="LineNr">185 </span>    <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L186" class="LineNr">186 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L187" class="LineNr">187 </span>  <span class="Delimiter">}</span>
-<span id="L188" class="LineNr">188 </span><span class="Delimiter">}</span>
-<span id="L189" class="LineNr">189 </span>
-<span id="L190" class="LineNr">190 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span> <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L191" class="LineNr">191 </span>  <span class="Identifier">return</span> <a href='010vm.cc.html#L104'>read_mem_u8</a><span class="Delimiter">(</span>EIP++<span class="Delimiter">);</span>
-<span id="L192" class="LineNr">192 </span><span class="Delimiter">}</span>
-<span id="L193" class="LineNr">193 </span>
-<span id="L194" class="LineNr">194 </span><span class="Comment">//: start tracking supported opcodes</span>
-<span id="L195" class="LineNr">195 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L196" class="LineNr">196 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <a href='010vm.cc.html#L196'>name</a><span class="Delimiter">;</span>
-<span id="L197" class="LineNr">197 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <a href='010vm.cc.html#L197'>name_0f</a><span class="Delimiter">;</span>
-<span id="L198" class="LineNr">198 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <a href='010vm.cc.html#L198'>name_f3</a><span class="Delimiter">;</span>
-<span id="L199" class="LineNr">199 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <a href='010vm.cc.html#L199'>name_f3_0f</a><span class="Delimiter">;</span>
-<span id="L200" class="LineNr">200 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L201" class="LineNr">201 </span><a href='010vm.cc.html#L203'>init_op_names</a><span class="Delimiter">();</span>
-<span id="L202" class="LineNr">202 </span><span class="Delimiter">:(code)</span>
-<span id="L203" class="LineNr">203 </span><span class="Normal">void</span> <a href='010vm.cc.html#L203'>init_op_names</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L204" class="LineNr">204 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;f4&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;halt&quot;</span><span class="Delimiter">);</span>
-<span id="L205" class="LineNr">205 </span>  <span class="Comment">// End Initialize Op Names(name)</span>
-<span id="L206" class="LineNr">206 </span><span class="Delimiter">}</span>
-<span id="L207" class="LineNr">207 </span>
-<span id="L208" class="LineNr">208 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Special-cases(key)&quot;)</span>
-<span id="L209" class="LineNr">209 </span><span class="Normal">if</span> <span class="Delimiter">(</span>key == <span class="Constant">&quot;opcodes&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L210" class="LineNr">210 </span>  cerr &lt;&lt; <span class="Constant">&quot;Opcodes currently supported by SubX:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L211" class="LineNr">211 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010vm.cc.html#L196'>name</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010vm.cc.html#L196'>name</a><span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L212" class="LineNr">212 </span>    cerr &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L213" class="LineNr">213 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010vm.cc.html#L197'>name_0f</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010vm.cc.html#L197'>name_0f</a><span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L214" class="LineNr">214 </span>    cerr &lt;&lt; <span class="Constant">&quot;  0f &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010vm.cc.html#L198'>name_f3</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010vm.cc.html#L198'>name_f3</a><span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L216" class="LineNr">216 </span>    cerr &lt;&lt; <span class="Constant">&quot;  f3 &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L217" class="LineNr">217 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010vm.cc.html#L199'>name_f3_0f</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010vm.cc.html#L199'>name_f3_0f</a><span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L218" class="LineNr">218 </span>    cerr &lt;&lt; <span class="Constant">&quot;  f3 0f &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L219" class="LineNr">219 </span>  cerr &lt;&lt; <span class="Constant">&quot;Run `subx help instructions` for details on <a href='011run.cc.html#L109'>words</a> like 'r32' and 'disp8'.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L220" class="LineNr">220 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L221" class="LineNr">221 </span><span class="Delimiter">}</span>
-<span id="L222" class="LineNr">222 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Contents&quot;)</span>
-<span id="L223" class="LineNr">223 </span>cerr &lt;&lt; <span class="Constant">&quot;  opcodes</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L224" class="LineNr">224 </span>
-<span id="L225" class="LineNr">225 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L226" class="LineNr">226 </span><span class="Comment">#include &lt;iomanip&gt;</span>
-<span id="L227" class="LineNr">227 </span><span class="Comment">#define HEXBYTE  std::hex &lt;&lt; std::setw(2) &lt;&lt; std::setfill('0')</span>
-<span id="L228" class="LineNr">228 </span><span class="Comment">#define HEXWORD  std::hex &lt;&lt; std::setw(8) &lt;&lt; std::setfill('0')</span>
-<span id="L229" class="LineNr">229 </span><span class="Comment">// ugly that iostream doesn't print uint8_t as an integer</span>
-<span id="L230" class="LineNr">230 </span><span class="Comment">#define NUM(X) static_cast&lt;int&gt;(X)</span>
-<span id="L231" class="LineNr">231 </span><span class="Comment">#include &lt;stdint.h&gt;</span>
+<span id="L149" class="LineNr">149 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;inst: 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; <a href='010vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L150" class="LineNr">150 </span><span class="CommentedCode">//?   dump_registers();</span>
+<span id="L151" class="LineNr">151 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;inst: 0x&quot; &lt;&lt; EIP &lt;&lt; &quot; =&gt; &quot;;</span>
+<span id="L152" class="LineNr">152 </span>  op = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
+<span id="L153" class="LineNr">153 </span><span class="CommentedCode">//?   cerr &lt;&lt; HEXBYTE &lt;&lt; NUM(op) &lt;&lt; '\n';</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L155" class="LineNr">155 </span>  <span class="Normal">case</span> <span class="Constant">0xf4</span>:  <span class="Comment">// hlt</span>
+<span id="L156" class="LineNr">156 </span>    <a href='010vm.cc.html#L29'>EIP</a> = <a href='010vm.cc.html#L95'>End_of_program</a><span class="Delimiter">;</span>
+<span id="L157" class="LineNr">157 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L158" class="LineNr">158 </span>  <span class="Comment">// End Single-Byte Opcodes</span>
+<span id="L159" class="LineNr">159 </span>  <span class="Normal">case</span> <span class="Constant">0x0f</span>:
+<span id="L160" class="LineNr">160 </span>    <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L161" class="LineNr">161 </span>    <span class="Comment">// End Two-Byte Opcodes Starting With 0f</span>
+<span id="L162" class="LineNr">162 </span>    <span class="Normal">default</span>:
+<span id="L163" class="LineNr">163 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after 0f: &quot;</span> &lt;&lt; <a href='010vm.cc.html#L238'>HEXBYTE</a> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L164" class="LineNr">164 </span>      <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L165" class="LineNr">165 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L166" class="LineNr">166 </span>    <span class="Delimiter">}</span>
+<span id="L167" class="LineNr">167 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L168" class="LineNr">168 </span>  <span class="Normal">case</span> <span class="Constant">0xf3</span>:
+<span id="L169" class="LineNr">169 </span>    <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L170" class="LineNr">170 </span>    <span class="Comment">// End Two-Byte Opcodes Starting With f3</span>
+<span id="L171" class="LineNr">171 </span>    <span class="Normal">case</span> <span class="Constant">0x0f</span>:
+<span id="L172" class="LineNr">172 </span>      <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L173" class="LineNr">173 </span>      <span class="Comment">// End Three-Byte Opcodes Starting With f3 0f</span>
+<span id="L174" class="LineNr">174 </span>      <span class="Normal">default</span>:
+<span id="L175" class="LineNr">175 </span>        cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f3 0f: &quot;</span> &lt;&lt; <a href='010vm.cc.html#L238'>HEXBYTE</a> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L176" class="LineNr">176 </span>        <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L177" class="LineNr">177 </span>        exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L178" class="LineNr">178 </span>      <span class="Delimiter">}</span>
+<span id="L179" class="LineNr">179 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L180" class="LineNr">180 </span>    <span class="Normal">default</span>:
+<span id="L181" class="LineNr">181 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f3: &quot;</span> &lt;&lt; <a href='010vm.cc.html#L238'>HEXBYTE</a> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L182" class="LineNr">182 </span>      <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L183" class="LineNr">183 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L184" class="LineNr">184 </span>    <span class="Delimiter">}</span>
+<span id="L185" class="LineNr">185 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L186" class="LineNr">186 </span>  <span class="Normal">default</span>:
+<span id="L187" class="LineNr">187 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized opcode: &quot;</span> &lt;&lt; <a href='010vm.cc.html#L238'>HEXBYTE</a> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L188" class="LineNr">188 </span>    <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L189" class="LineNr">189 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</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="Delimiter">}</span>
+<span id="L192" class="LineNr">192 </span>
+<span id="L193" class="LineNr">193 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span> <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L194" class="LineNr">194 </span>  <span class="Identifier">return</span> <a href='010vm.cc.html#L104'>read_mem_u8</a><span class="Delimiter">(</span>EIP++<span class="Delimiter">);</span>
+<span id="L195" class="LineNr">195 </span><span class="Delimiter">}</span>
+<span id="L196" class="LineNr">196 </span>
+<span id="L197" class="LineNr">197 </span><span class="Normal">void</span> <a href='010vm.cc.html#L197'>dump_registers</a><span class="Delimiter">()</span> <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> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='010vm.cc.html#L21'>NUM_INT_REGISTERS</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L199" class="LineNr">199 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> cerr &lt;&lt; <span class="Constant">&quot;; &quot;</span><span class="Delimiter">;</span>
+<span id="L200" class="LineNr">200 </span>    cerr &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; std::hex &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">8</span><span class="Delimiter">)</span> &lt;&lt; std::setfill<span class="Delimiter">(</span><span class="Constant">'_'</span><span class="Delimiter">)</span> &lt;&lt; Reg[i]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Delimiter">}</span>
+<span id="L202" class="LineNr">202 </span>  cerr &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;; <a href='010vm.cc.html#L59'>OF</a>: &quot;</span> &lt;&lt; <a href='010vm.cc.html#L59'>OF</a> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L203" class="LineNr">203 </span><span class="Delimiter">}</span>
+<span id="L204" class="LineNr">204 </span>
+<span id="L205" class="LineNr">205 </span><span class="Comment">//: start tracking supported opcodes</span>
+<span id="L206" class="LineNr">206 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L207" class="LineNr">207 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <a href='010vm.cc.html#L207'>name</a><span class="Delimiter">;</span>
+<span id="L208" class="LineNr">208 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <a href='010vm.cc.html#L208'>name_0f</a><span class="Delimiter">;</span>
+<span id="L209" class="LineNr">209 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <a href='010vm.cc.html#L209'>name_f3</a><span class="Delimiter">;</span>
+<span id="L210" class="LineNr">210 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <a href='010vm.cc.html#L210'>name_f3_0f</a><span class="Delimiter">;</span>
+<span id="L211" class="LineNr">211 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L212" class="LineNr">212 </span><a href='010vm.cc.html#L214'>init_op_names</a><span class="Delimiter">();</span>
+<span id="L213" class="LineNr">213 </span><span class="Delimiter">:(code)</span>
+<span id="L214" class="LineNr">214 </span><span class="Normal">void</span> <a href='010vm.cc.html#L214'>init_op_names</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L215" class="LineNr">215 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;f4&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;halt&quot;</span><span class="Delimiter">);</span>
+<span id="L216" class="LineNr">216 </span>  <span class="Comment">// End Initialize Op Names(name)</span>
+<span id="L217" class="LineNr">217 </span><span class="Delimiter">}</span>
+<span id="L218" class="LineNr">218 </span>
+<span id="L219" class="LineNr">219 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Special-cases(key)&quot;)</span>
+<span id="L220" class="LineNr">220 </span><span class="Normal">if</span> <span class="Delimiter">(</span>key == <span class="Constant">&quot;opcodes&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L221" class="LineNr">221 </span>  cerr &lt;&lt; <span class="Constant">&quot;Opcodes currently supported by SubX:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L222" class="LineNr">222 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010vm.cc.html#L207'>name</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010vm.cc.html#L207'>name</a><span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L223" class="LineNr">223 </span>    cerr &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L224" class="LineNr">224 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010vm.cc.html#L208'>name_0f</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010vm.cc.html#L208'>name_0f</a><span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L225" class="LineNr">225 </span>    cerr &lt;&lt; <span class="Constant">&quot;  0f &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L226" class="LineNr">226 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010vm.cc.html#L209'>name_f3</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010vm.cc.html#L209'>name_f3</a><span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L227" class="LineNr">227 </span>    cerr &lt;&lt; <span class="Constant">&quot;  f3 &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L228" class="LineNr">228 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010vm.cc.html#L210'>name_f3_0f</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010vm.cc.html#L210'>name_f3_0f</a><span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L229" class="LineNr">229 </span>    cerr &lt;&lt; <span class="Constant">&quot;  f3 0f &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L230" class="LineNr">230 </span>  cerr &lt;&lt; <span class="Constant">&quot;Run `subx help instructions` for details on <a href='011run.cc.html#L111'>words</a> like 'r32' and 'disp8'.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L231" class="LineNr">231 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L232" class="LineNr">232 </span><span class="Delimiter">}</span>
+<span id="L233" class="LineNr">233 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Contents&quot;)</span>
+<span id="L234" class="LineNr">234 </span>cerr &lt;&lt; <span class="Constant">&quot;  opcodes</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L235" class="LineNr">235 </span>
+<span id="L236" class="LineNr">236 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L237" class="LineNr">237 </span><span class="Comment">#include &lt;iomanip&gt;</span>
+<span id="L238" class="LineNr">238 </span><span class="Comment">#define HEXBYTE  std::hex &lt;&lt; std::setw(2) &lt;&lt; std::setfill('0')</span>
+<span id="L239" class="LineNr">239 </span><span class="Comment">#define HEXWORD  std::hex &lt;&lt; std::setw(8) &lt;&lt; std::setfill('0')</span>
+<span id="L240" class="LineNr">240 </span><span class="Comment">// ugly that iostream doesn't print uint8_t as an integer</span>
+<span id="L241" class="LineNr">241 </span><span class="Comment">#define NUM(X) static_cast&lt;int&gt;(X)</span>
+<span id="L242" class="LineNr">242 </span><span class="Comment">#include &lt;stdint.h&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/011direct_addressing.cc.html b/html/subx/011direct_addressing.cc.html
deleted file mode 100644
index f22eca60..00000000
--- a/html/subx/011direct_addressing.cc.html
+++ /dev/null
@@ -1,390 +0,0 @@
-<!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/011direct_addressing.cc</title>
-<meta name="Generator" content="Vim/7.4">
-<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; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.traceContains { color: #008000; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
-.cSpecial { 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">//: operating directly on a register</span>
-<span id="L2" class="LineNr">  2 </span>
-<span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(scenario add_r32_to_r32)</span>
-<span id="L4" class="LineNr">  4 </span><span class="Special">% Reg[0].i = 0x10;</span>
-<span id="L5" class="LineNr">  5 </span><span class="Special">% Reg[3].i = 1;</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L7" class="LineNr">  7 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  d8                                      <span class="Comment"># add EBX to EAX</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L9" class="LineNr">  9 </span><span class="traceContains">+run: add <a href='010core.cc.html#L10'>EBX</a> to r/m32</span>
-<span id="L10" class="LineNr"> 10 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L11" class="LineNr"> 11 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L12" class="LineNr"> 12 </span>
-<span id="L13" class="LineNr"> 13 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L14" class="LineNr"> 14 </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="L15" class="LineNr"> 15 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L16" class="LineNr"> 16 </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="L17" class="LineNr"> 17 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L18" class="LineNr"> 18 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L19" class="LineNr"> 19 </span>  <a href='010core.cc.html#L43'>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="L20" class="LineNr"> 20 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Delimiter">}</span>
-<span id="L22" class="LineNr"> 22 </span>
-<span id="L23" class="LineNr"> 23 </span><span class="Delimiter">:(code)</span>
-<span id="L24" class="LineNr"> 24 </span><span class="Comment">// Implement tables 2-2 and 2-3 in the Intel manual, Volume 2.</span>
-<span id="L25" class="LineNr"> 25 </span><span class="Comment">// We return a pointer so that instructions can write to multiple bytes in</span>
-<span id="L26" class="LineNr"> 26 </span><span class="Comment">// 'Mem' at once.</span>
-<span id="L27" class="LineNr"> 27 </span><span class="Normal">int32_t</span>* <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L28" class="LineNr"> 28 </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="L29" class="LineNr"> 29 </span>  <span class="Comment">// ignore middle 3 'reg opcode' bits</span>
-<span id="L30" class="LineNr"> 30 </span>  <span class="Normal">uint8_t</span> rm = modrm &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L31" class="LineNr"> 31 </span>  <span class="Normal">uint32_t</span> addr = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L33" class="LineNr"> 33 </span>  <span class="Normal">case</span> <span class="Constant">3</span>:
-<span id="L34" class="LineNr"> 34 </span>    <span class="Comment">// mod 3 is just register direct addressing</span>
-<span id="L35" class="LineNr"> 35 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L36" class="LineNr"> 36 </span>    <span class="Identifier">return</span> &amp;Reg[rm]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L37" class="LineNr"> 37 </span>  <span class="Comment">// End Mod Special-cases(addr)</span>
-<span id="L38" class="LineNr"> 38 </span>  <span class="Normal">default</span>:
-<span id="L39" class="LineNr"> 39 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized mod bits: &quot;</span> &lt;&lt; <a href='010core.cc.html#L246'>NUM</a><span class="Delimiter">(</span>mod<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L40" class="LineNr"> 40 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L41" class="LineNr"> 41 </span>  <span class="Delimiter">}</span>
-<span id="L42" class="LineNr"> 42 </span>  <span class="Comment">//: other mods are indirect, and they'll set addr appropriately</span>
-<span id="L43" class="LineNr"> 43 </span>  assert<span class="Delimiter">(</span>addr &gt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L44" class="LineNr"> 44 </span>  assert<span class="Delimiter">(</span>addr + <span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">int32_t</span><span class="Delimiter">)</span> &lt;= <a href='010core.cc.html#L67'>Mem</a><span class="Delimiter">.</span>size<span class="Delimiter">());</span>
-<span id="L45" class="LineNr"> 45 </span>  <span class="Identifier">return</span> <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">int32_t</span>*&gt;<span class="Delimiter">(</span>&amp;Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>addr<span class="Delimiter">));</span>  <span class="Comment">// rely on the host itself being in little-endian order</span>
-<span id="L46" class="LineNr"> 46 </span><span class="Delimiter">}</span>
-<span id="L47" class="LineNr"> 47 </span>
-<span id="L48" class="LineNr"> 48 </span><span class="SalientComment">//:: subtract</span>
-<span id="L49" class="LineNr"> 49 </span>
-<span id="L50" class="LineNr"> 50 </span><span class="Delimiter">:(scenario subtract_r32_from_r32)</span>
-<span id="L51" class="LineNr"> 51 </span><span class="Special">% Reg[0].i = 10;</span>
-<span id="L52" class="LineNr"> 52 </span><span class="Special">% Reg[3].i = 1;</span>
-<span id="L53" class="LineNr"> 53 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L54" class="LineNr"> 54 </span>  <span class="Constant">29</span>  d8                                      <span class="Comment"># subtract EBX from EAX</span>
-<span id="L55" class="LineNr"> 55 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L56" class="LineNr"> 56 </span><span class="traceContains">+run: subtract <a href='010core.cc.html#L10'>EBX</a> from r/m32</span>
-<span id="L57" class="LineNr"> 57 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L58" class="LineNr"> 58 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L59" class="LineNr"> 59 </span>
-<span id="L60" class="LineNr"> 60 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L61" class="LineNr"> 61 </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="L62" class="LineNr"> 62 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L63" class="LineNr"> 63 </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="L64" class="LineNr"> 64 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L65" class="LineNr"> 65 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L66" class="LineNr"> 66 </span>  <a href='010core.cc.html#L43'>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="L67" class="LineNr"> 67 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L68" class="LineNr"> 68 </span><span class="Delimiter">}</span>
-<span id="L69" class="LineNr"> 69 </span>
-<span id="L70" class="LineNr"> 70 </span><span class="SalientComment">//:: and</span>
-<span id="L71" class="LineNr"> 71 </span>
-<span id="L72" class="LineNr"> 72 </span><span class="Delimiter">:(scenario and_r32_with_r32)</span>
-<span id="L73" class="LineNr"> 73 </span><span class="Special">% Reg[0].i = 0x0a0b0c0d;</span>
-<span id="L74" class="LineNr"> 74 </span><span class="Special">% Reg[3].i = 0x000000ff;</span>
-<span id="L75" class="LineNr"> 75 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L76" class="LineNr"> 76 </span>  <span class="Constant">21</span>  d8                                      <span class="Comment"># and EBX with destination EAX</span>
-<span id="L77" class="LineNr"> 77 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L78" class="LineNr"> 78 </span><span class="traceContains">+run: and <a href='010core.cc.html#L10'>EBX</a> with r/m32</span>
-<span id="L79" class="LineNr"> 79 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L80" class="LineNr"> 80 </span><span class="traceContains">+run: storing 0x0000000d</span>
-<span id="L81" class="LineNr"> 81 </span>
-<span id="L82" class="LineNr"> 82 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L83" class="LineNr"> 83 </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="L84" class="LineNr"> 84 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L85" class="LineNr"> 85 </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="L86" class="LineNr"> 86 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L87" class="LineNr"> 87 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L88" class="LineNr"> 88 </span>  <a href='010core.cc.html#L55'>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="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>
-<span id="L91" class="LineNr"> 91 </span>
-<span id="L92" class="LineNr"> 92 </span><span class="SalientComment">//:: or</span>
-<span id="L93" class="LineNr"> 93 </span>
-<span id="L94" class="LineNr"> 94 </span><span class="Delimiter">:(scenario or_r32_with_r32)</span>
-<span id="L95" class="LineNr"> 95 </span><span class="Special">% Reg[0].i = 0x0a0b0c0d;</span>
-<span id="L96" class="LineNr"> 96 </span><span class="Special">% Reg[3].i = 0xa0b0c0d0;</span>
-<span id="L97" class="LineNr"> 97 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="Error">09</span>  d8                                      <span class="Comment"># or EBX with destination EAX</span>
-<span id="L99" class="LineNr"> 99 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L100" class="LineNr">100 </span><span class="traceContains">+run: or <a href='010core.cc.html#L10'>EBX</a> with r/m32</span>
-<span id="L101" class="LineNr">101 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L102" class="LineNr">102 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
-<span id="L103" class="LineNr">103 </span>
-<span id="L104" class="LineNr">104 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L105" class="LineNr">105 </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="L106" class="LineNr">106 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L107" class="LineNr">107 </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="L108" class="LineNr">108 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L109" class="LineNr">109 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L110" class="LineNr">110 </span>  <a href='010core.cc.html#L55'>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="L111" class="LineNr">111 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L112" class="LineNr">112 </span><span class="Delimiter">}</span>
-<span id="L113" class="LineNr">113 </span>
-<span id="L114" class="LineNr">114 </span><span class="SalientComment">//:: xor</span>
-<span id="L115" class="LineNr">115 </span>
-<span id="L116" class="LineNr">116 </span><span class="Delimiter">:(scenario xor_r32_with_r32)</span>
-<span id="L117" class="LineNr">117 </span><span class="Special">% Reg[0].i = 0x0a0b0c0d;</span>
-<span id="L118" class="LineNr">118 </span><span class="Special">% Reg[3].i = 0xaabbc0d0;</span>
-<span id="L119" class="LineNr">119 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L120" class="LineNr">120 </span>  <span class="Constant">31</span>  d8                                      <span class="Comment"># xor EBX with destination EAX</span>
-<span id="L121" class="LineNr">121 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L122" class="LineNr">122 </span><span class="traceContains">+run: xor <a href='010core.cc.html#L10'>EBX</a> with r/m32</span>
-<span id="L123" class="LineNr">123 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L124" class="LineNr">124 </span><span class="traceContains">+run: storing 0xa0b0ccdd</span>
-<span id="L125" class="LineNr">125 </span>
-<span id="L126" class="LineNr">126 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L127" class="LineNr">127 </span><span class="Normal">case</span> <span class="Constant">0x31</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
-<span id="L128" class="LineNr">128 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L129" class="LineNr">129 </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="L130" class="LineNr">130 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L131" class="LineNr">131 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L132" class="LineNr">132 </span>  <a href='010core.cc.html#L55'>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="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 id="L136" class="LineNr">136 </span><span class="SalientComment">//:: not</span>
-<span id="L137" class="LineNr">137 </span>
-<span id="L138" class="LineNr">138 </span><span class="Delimiter">:(scenario not_r32)</span>
-<span id="L139" class="LineNr">139 </span><span class="Special">% Reg[3].i = 0x0f0f00ff;</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>  f7  c3                                      <span class="Comment"># not EBX</span>
-<span id="L142" class="LineNr">142 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 000 (unused) 011 (dest EBX)</span>
-<span id="L143" class="LineNr">143 </span><span class="traceContains">+run: 'not' of r/m32</span>
-<span id="L144" class="LineNr">144 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L145" class="LineNr">145 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
-<span id="L146" class="LineNr">146 </span>
-<span id="L147" class="LineNr">147 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L148" class="LineNr">148 </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="L149" class="LineNr">149 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L150" class="LineNr">150 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'not' of r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L151" class="LineNr">151 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L152" class="LineNr">152 </span>  *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
-<span id="L153" class="LineNr">153 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L154" class="LineNr">154 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
-<span id="L155" class="LineNr">155 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L156" class="LineNr">156 </span>  <a href='010core.cc.html#L33'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L158" class="LineNr">158 </span><span class="Delimiter">}</span>
-<span id="L159" class="LineNr">159 </span>
-<span id="L160" class="LineNr">160 </span><span class="SalientComment">//:: compare (cmp)</span>
-<span id="L161" class="LineNr">161 </span>
-<span id="L162" class="LineNr">162 </span><span class="Delimiter">:(scenario compare_r32_with_r32_greater)</span>
-<span id="L163" class="LineNr">163 </span><span class="Special">% Reg[0].i = 0x0a0b0c0d;</span>
-<span id="L164" class="LineNr">164 </span><span class="Special">% Reg[3].i = 0x0a0b0c07;</span>
-<span id="L165" class="LineNr">165 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L166" class="LineNr">166 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L167" class="LineNr">167 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L168" class="LineNr">168 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L10'>EBX</a> with r/m32</span>
-<span id="L169" class="LineNr">169 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L170" class="LineNr">170 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L171" class="LineNr">171 </span>
-<span id="L172" class="LineNr">172 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L173" class="LineNr">173 </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="L174" class="LineNr">174 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L175" class="LineNr">175 </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="L176" class="LineNr">176 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L177" class="LineNr">177 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L178" class="LineNr">178 </span>  <span class="Normal">int32_t</span> arg2 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L179" class="LineNr">179 </span>  <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L180" class="LineNr">180 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L181" class="LineNr">181 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L182" class="LineNr">182 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L183" class="LineNr">183 </span>  <a href='010core.cc.html#L33'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L184" class="LineNr">184 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L33'>OF</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L185" class="LineNr">185 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L186" class="LineNr">186 </span><span class="Delimiter">}</span>
-<span id="L187" class="LineNr">187 </span>
-<span id="L188" class="LineNr">188 </span><span class="Delimiter">:(scenario compare_r32_with_r32_lesser)</span>
-<span id="L189" class="LineNr">189 </span><span class="Special">% Reg[0].i = 0x0a0b0c07;</span>
-<span id="L190" class="LineNr">190 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
-<span id="L191" class="LineNr">191 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L192" class="LineNr">192 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L193" class="LineNr">193 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L194" class="LineNr">194 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L10'>EBX</a> with r/m32</span>
-<span id="L195" class="LineNr">195 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L196" class="LineNr">196 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L197" class="LineNr">197 </span>
-<span id="L198" class="LineNr">198 </span><span class="Delimiter">:(scenario compare_r32_with_r32_equal)</span>
-<span id="L199" class="LineNr">199 </span><span class="Special">% Reg[0].i = 0x0a0b0c0d;</span>
-<span id="L200" class="LineNr">200 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
-<span id="L201" class="LineNr">201 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L202" class="LineNr">202 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L203" class="LineNr">203 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L204" class="LineNr">204 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L10'>EBX</a> with r/m32</span>
-<span id="L205" class="LineNr">205 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L206" class="LineNr">206 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L207" class="LineNr">207 </span>
-<span id="L208" class="LineNr">208 </span><span class="SalientComment">//:: copy (mov)</span>
-<span id="L209" class="LineNr">209 </span>
-<span id="L210" class="LineNr">210 </span><span class="Delimiter">:(scenario copy_r32_to_r32)</span>
-<span id="L211" class="LineNr">211 </span><span class="Special">% Reg[3].i = 0xaf;</span>
-<span id="L212" class="LineNr">212 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L213" class="LineNr">213 </span>  <span class="Constant">89</span>  d8                                      <span class="Comment"># copy EBX to EAX</span>
-<span id="L214" class="LineNr">214 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L215" class="LineNr">215 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L10'>EBX</a> to r/m32</span>
-<span id="L216" class="LineNr">216 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L217" class="LineNr">217 </span><span class="traceContains">+run: storing 0x000000af</span>
-<span id="L218" class="LineNr">218 </span>
-<span id="L219" class="LineNr">219 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L220" class="LineNr">220 </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="L221" class="LineNr">221 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L222" class="LineNr">222 </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="L223" class="LineNr">223 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L224" class="LineNr">224 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L225" class="LineNr">225 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L226" class="LineNr">226 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L227" class="LineNr">227 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L228" class="LineNr">228 </span><span class="Delimiter">}</span>
-<span id="L229" class="LineNr">229 </span>
-<span id="L230" class="LineNr">230 </span><span class="SalientComment">//:: xchg</span>
-<span id="L231" class="LineNr">231 </span>
-<span id="L232" class="LineNr">232 </span><span class="Delimiter">:(scenario xchg_r32_with_r32)</span>
-<span id="L233" class="LineNr">233 </span><span class="Special">% Reg[3].i = 0xaf;</span>
-<span id="L234" class="LineNr">234 </span><span class="Special">% Reg[0].i = 0x2e;</span>
-<span id="L235" class="LineNr">235 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L236" class="LineNr">236 </span>  <span class="Constant">87</span>  d8                                      <span class="Comment"># exchange EBX with EAX</span>
-<span id="L237" class="LineNr">237 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L238" class="LineNr">238 </span><span class="traceContains">+run: exchange <a href='010core.cc.html#L10'>EBX</a> with r/m32</span>
-<span id="L239" class="LineNr">239 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L240" class="LineNr">240 </span><span class="traceContains">+run: storing 0x000000af in r/m32</span>
-<span id="L241" class="LineNr">241 </span><span class="traceContains">+run: storing 0x0000002e in <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L242" class="LineNr">242 </span>
-<span id="L243" class="LineNr">243 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L244" class="LineNr">244 </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="L245" class="LineNr">245 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L246" class="LineNr">246 </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="L247" class="LineNr">247 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L248" class="LineNr">248 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L249" class="LineNr">249 </span>  <span class="Normal">int32_t</span> tmp = *arg1<span class="Delimiter">;</span>
-<span id="L250" class="LineNr">250 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L251" class="LineNr">251 </span>  Reg[reg2]<span class="Delimiter">.</span>i = tmp<span class="Delimiter">;</span>
-<span id="L252" class="LineNr">252 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <span class="Constant">&quot; in r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L253" class="LineNr">253 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; Reg[reg2]<span class="Delimiter">.</span>i &lt;&lt; <span class="Constant">&quot; in &quot;</span> &lt;&lt; <a href='010core.cc.html#L227'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L254" class="LineNr">254 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L255" class="LineNr">255 </span><span class="Delimiter">}</span>
-<span id="L256" class="LineNr">256 </span>
-<span id="L257" class="LineNr">257 </span><span class="SalientComment">//:: push</span>
-<span id="L258" class="LineNr">258 </span>
-<span id="L259" class="LineNr">259 </span><span class="Delimiter">:(scenario push_r32)</span>
-<span id="L260" class="LineNr">260 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L261" class="LineNr">261 </span><span class="Special">% Reg[EBX].i = 0x0000000a;</span>
-<span id="L262" class="LineNr">262 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L263" class="LineNr">263 </span>  <span class="Constant">53</span>                                          <span class="Comment"># push EBX to stack</span>
-<span id="L264" class="LineNr">264 </span><span class="traceContains">+run: <a href='011direct_addressing.cc.html#L283'>push</a> <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L265" class="LineNr">265 </span><span class="traceContains">+run: decrementing <a href='010core.cc.html#L11'>ESP</a> to 0x00000060</span>
-<span id="L266" class="LineNr">266 </span><span class="traceContains">+run: pushing value 0x0000000a</span>
-<span id="L267" class="LineNr">267 </span>
-<span id="L268" class="LineNr">268 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L269" class="LineNr">269 </span><span class="Normal">case</span> <span class="Constant">0x50</span>:
-<span id="L270" class="LineNr">270 </span><span class="Normal">case</span> <span class="Constant">0x51</span>:
-<span id="L271" class="LineNr">271 </span><span class="Normal">case</span> <span class="Constant">0x52</span>:
-<span id="L272" class="LineNr">272 </span><span class="Normal">case</span> <span class="Constant">0x53</span>:
-<span id="L273" class="LineNr">273 </span><span class="Normal">case</span> <span class="Constant">0x54</span>:
-<span id="L274" class="LineNr">274 </span><span class="Normal">case</span> <span class="Constant">0x55</span>:
-<span id="L275" class="LineNr">275 </span><span class="Normal">case</span> <span class="Constant">0x56</span>:
-<span id="L276" class="LineNr">276 </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="L277" class="LineNr">277 </span>  <span class="Normal">uint8_t</span> <a href='010core.cc.html#L17'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L278" class="LineNr">278 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>rname</a><span class="Delimiter">(</span><a href='010core.cc.html#L17'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L279" class="LineNr">279 </span>  <a href='011direct_addressing.cc.html#L283'>push</a><span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L280" class="LineNr">280 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L281" class="LineNr">281 </span><span class="Delimiter">}</span>
-<span id="L282" class="LineNr">282 </span><span class="Delimiter">:(code)</span>
-<span id="L283" class="LineNr">283 </span><span class="Normal">void</span> <a href='011direct_addressing.cc.html#L283'>push</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L284" class="LineNr">284 </span>  Reg[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L285" class="LineNr">285 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrementing <a href='010core.cc.html#L11'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L286" class="LineNr">286 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pushing value 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L287" class="LineNr">287 </span>  *<span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>&amp;Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">))</span> = val<span class="Delimiter">;</span>
-<span id="L288" class="LineNr">288 </span><span class="Delimiter">}</span>
-<span id="L289" class="LineNr">289 </span>
-<span id="L290" class="LineNr">290 </span><span class="SalientComment">//:: pop</span>
-<span id="L291" class="LineNr">291 </span>
-<span id="L292" class="LineNr">292 </span><span class="Delimiter">:(scenario pop_r32)</span>
-<span id="L293" class="LineNr">293 </span><span class="Special">% Reg[ESP].u = 0x60;</span>
-<span id="L294" class="LineNr">294 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0000000a);</span>
-<span id="L295" class="LineNr">295 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L296" class="LineNr">296 </span>  5b                                          <span class="Comment"># pop stack to EBX</span>
-<span id="L297" class="LineNr">297 </span><span class="traceContains">+run: <a href='011direct_addressing.cc.html#L316'>pop</a> into <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L298" class="LineNr">298 </span><span class="traceContains">+run: popping value 0x0000000a</span>
-<span id="L299" class="LineNr">299 </span><span class="traceContains">+run: incrementing <a href='010core.cc.html#L11'>ESP</a> to 0x00000064</span>
-<span id="L300" class="LineNr">300 </span>
-<span id="L301" class="LineNr">301 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L302" class="LineNr">302 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
-<span id="L303" class="LineNr">303 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
-<span id="L304" class="LineNr">304 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
-<span id="L305" class="LineNr">305 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
-<span id="L306" class="LineNr">306 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
-<span id="L307" class="LineNr">307 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
-<span id="L308" class="LineNr">308 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
-<span id="L309" class="LineNr">309 </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="L310" class="LineNr">310 </span>  <span class="Normal">uint8_t</span> <a href='010core.cc.html#L17'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L311" class="LineNr">311 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>rname</a><span class="Delimiter">(</span><a href='010core.cc.html#L17'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L312" class="LineNr">312 </span>  Reg[reg]<span class="Delimiter">.</span>u = <a href='011direct_addressing.cc.html#L316'>pop</a><span class="Delimiter">();</span>
-<span id="L313" class="LineNr">313 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L314" class="LineNr">314 </span><span class="Delimiter">}</span>
-<span id="L315" class="LineNr">315 </span><span class="Delimiter">:(code)</span>
-<span id="L316" class="LineNr">316 </span><span class="Normal">uint32_t</span> <a href='011direct_addressing.cc.html#L316'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L317" class="LineNr">317 </span>  <span class="Normal">uint32_t</span> result = *<span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>&amp;Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">));</span>
-<span id="L318" class="LineNr">318 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L319" class="LineNr">319 </span>  Reg[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L320" class="LineNr">320 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L11'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L321" class="LineNr">321 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L322" class="LineNr">322 </span><span class="Delimiter">}</span>
-</pre>
-</body>
-</html>
-<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/011run.cc.html b/html/subx/011run.cc.html
index 0f5aec0f..0248497c 100644
--- a/html/subx/011run.cc.html
+++ b/html/subx/011run.cc.html
@@ -67,26 +67,26 @@ if ('onhashchange' in window) {
 <span id="L5" class="LineNr">  5 </span>
 <span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Texts&quot;)</span>
 <span id="L7" class="LineNr">  7 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;syntax&quot;</span><span class="Delimiter">,</span>
-<span id="L8" class="LineNr">  8 </span>  <span class="Constant">&quot;SubX programs consist of <a href='011run.cc.html#L95'>segments</a>, each segment in turn consisting of lines.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L9" class="LineNr">  9 </span>  <span class="Constant">&quot;Line-endings are significant; each <a href='011run.cc.html#L108'>line</a> should contain a single</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L8" class="LineNr">  8 </span>  <span class="Constant">&quot;SubX programs consist of <a href='011run.cc.html#L97'>segments</a>, each segment in turn consisting of lines.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L9" class="LineNr">  9 </span>  <span class="Constant">&quot;Line-endings are significant; each <a href='011run.cc.html#L110'>line</a> should contain a single</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L10" class="LineNr"> 10 </span>  <span class="Constant">&quot;instruction, macro or directive.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L11" class="LineNr"> 11 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L12" class="LineNr"> 12 </span>  <span class="Constant">&quot;Comments <a href='011run.cc.html#L103'>start</a> with the '#' character. It should be at the <a href='011run.cc.html#L103'>start</a> of a <a href='011run.cc.html#L113'>word</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L13" class="LineNr"> 13 </span>  <span class="Constant">&quot;(start of <a href='011run.cc.html#L108'>line</a>, or following a space).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L12" class="LineNr"> 12 </span>  <span class="Constant">&quot;Comments <a href='011run.cc.html#L105'>start</a> with the '#' character. It should be at the <a href='011run.cc.html#L105'>start</a> of a <a href='011run.cc.html#L115'>word</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L13" class="LineNr"> 13 </span>  <span class="Constant">&quot;(start of <a href='011run.cc.html#L110'>line</a>, or following a space).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L14" class="LineNr"> 14 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L15" class="LineNr"> 15 </span>  <span class="Constant">&quot;Each segment starts with a header <a href='011run.cc.html#L108'>line</a>: a '==' delimiter followed by the</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L15" class="LineNr"> 15 </span>  <span class="Constant">&quot;Each segment starts with a header <a href='011run.cc.html#L110'>line</a>: a '==' delimiter followed by the</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L16" class="LineNr"> 16 </span>  <span class="Constant">&quot;starting address for the segment.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L17" class="LineNr"> 17 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L18" class="LineNr"> 18 </span>  <span class="Constant">&quot;The starting address for a segment has some finicky requirements. But just</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L19" class="LineNr"> 19 </span>  <span class="Constant">&quot;start with a round number, and `subx` will try to guide you to a valid</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Constant">&quot;configuration.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="Constant">&quot;A good rule of thumb is to try to <a href='011run.cc.html#L103'>start</a> the first segment at the default</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;address of 0x08048000, and to <a href='011run.cc.html#L103'>start</a> each subsequent segment at least 0x1000</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L21" class="LineNr"> 21 </span>  <span class="Constant">&quot;A good rule of thumb is to try to <a href='011run.cc.html#L105'>start</a> the first segment at the default</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;address of 0x08048000, and to <a href='011run.cc.html#L105'>start</a> each subsequent segment at least 0x1000</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Constant">&quot;(most common page size) bytes after the last.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Constant">&quot;If a segment occupies than 0x1000 bytes you'll need to push subsequent</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Constant">&quot;segments further down.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L26" class="LineNr"> 26 </span>  <span class="Constant">&quot;Currently only the first segment contains executable code (because it gets</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L27" class="LineNr"> 27 </span>  <span class="Constant">&quot;annoying to have to change addresses in later <a href='011run.cc.html#L95'>segments</a> every time an earlier</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L27" class="LineNr"> 27 </span>  <span class="Constant">&quot;annoying to have to change addresses in later <a href='011run.cc.html#L97'>segments</a> every time an earlier</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Constant">&quot;one changes length; one of those finicky requirements).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L29" class="LineNr"> 29 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L30" class="LineNr"> 30 </span>  <span class="Constant">&quot;Lines consist of a series of words. Words can contain arbitrary metadata</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
@@ -123,119 +123,119 @@ if ('onhashchange' in window) {
 <span id="L61" class="LineNr"> 61 </span><span class="Comment">#   opcode        ModR/M                    SIB                   displacement    immediate</span>
 <span id="L62" class="LineNr"> 62 </span><span class="Comment">#   instruction   mod, reg, Reg/Mem bits    scale, index, base</span>
 <span id="L63" class="LineNr"> 63 </span><span class="Comment">#   1-3 bytes     0/1 byte                  0/1 byte              0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L64" class="LineNr"> 64 </span>    <span class="PreProc">0</span><span class="Constant">5</span>                                                                            0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to EAX</span>
-<span id="L65" class="LineNr"> 65 </span>
-<span id="L66" class="LineNr"> 66 </span><span class="Comment"># This program, when run, causes the following events in the trace:</span>
-<span id="L67" class="LineNr"> 67 </span><span class="traceContains">+load: 0x00000001 -&gt; 05</span>
-<span id="L68" class="LineNr"> 68 </span><span class="traceContains">+load: 0x00000002 -&gt; 0a</span>
-<span id="L69" class="LineNr"> 69 </span><span class="traceContains">+load: 0x00000003 -&gt; 0b</span>
-<span id="L70" class="LineNr"> 70 </span><span class="traceContains">+load: 0x00000004 -&gt; 0c</span>
-<span id="L71" class="LineNr"> 71 </span><span class="traceContains">+load: 0x00000005 -&gt; 0d</span>
-<span id="L72" class="LineNr"> 72 </span><span class="traceContains">+run: add <a href='011run.cc.html#L253'>imm32</a> 0x0d0c0b0a to <a href='010vm.cc.html#L23'>reg</a> <a href='010vm.cc.html#L13'>EAX</a></span>
-<span id="L73" class="LineNr"> 73 </span><span class="traceContains">+run: storing 0x0d0c0b0a</span>
-<span id="L74" class="LineNr"> 74 </span>
-<span id="L75" class="LineNr"> 75 </span><span class="Delimiter">:(code)</span>
-<span id="L76" class="LineNr"> 76 </span><span class="Comment">// top-level helper for scenarios: parse the input, transform any macros, load</span>
-<span id="L77" class="LineNr"> 77 </span><span class="Comment">// the final hex bytes into memory, run it</span>
-<span id="L78" class="LineNr"> 78 </span><span class="Normal">void</span> <a href='011run.cc.html#L78'>run</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L79" class="LineNr"> 79 </span>  <a href='011run.cc.html#L94'>program</a> p<span class="Delimiter">;</span>
-<span id="L80" class="LineNr"> 80 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
-<span id="L81" class="LineNr"> 81 </span>  <a href='011run.cc.html#L122'>parse</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L82" class="LineNr"> 82 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L208'>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="L83" class="LineNr"> 83 </span>  transform<span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L84" class="LineNr"> 84 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L208'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L85" class="LineNr"> 85 </span>  <a href='011run.cc.html#L195'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L208'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L87" class="LineNr"> 87 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010vm.cc.html#L29'>EIP</a> &lt; <a href='010vm.cc.html#L95'>End_of_program</a><span class="Delimiter">)</span>
-<span id="L88" class="LineNr"> 88 </span>    <a href='010vm.cc.html#L147'>run_one_instruction</a><span class="Delimiter">();</span>
-<span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span>
-<span id="L90" class="LineNr"> 90 </span>
-<span id="L91" class="LineNr"> 91 </span><span class="SalientComment">//:: core data structures</span>
+<span id="L64" class="LineNr"> 64 </span>    <span class="PreProc">0</span><span class="Constant">5</span>            <span class="Delimiter">.</span>                         <span class="Delimiter">.</span>                     <span class="Delimiter">.</span>               0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to EAX</span>
+<span id="L65" class="LineNr"> 65 </span><span class="Comment"># (The single periods are just to help the eye track long gaps between</span>
+<span id="L66" class="LineNr"> 66 </span><span class="Comment"># columns, and are otherwise ignored.)</span>
+<span id="L67" class="LineNr"> 67 </span>
+<span id="L68" class="LineNr"> 68 </span><span class="Comment"># This program, when run, causes the following events in the trace:</span>
+<span id="L69" class="LineNr"> 69 </span><span class="traceContains">+load: 0x00000001 -&gt; 05</span>
+<span id="L70" class="LineNr"> 70 </span><span class="traceContains">+load: 0x00000002 -&gt; 0a</span>
+<span id="L71" class="LineNr"> 71 </span><span class="traceContains">+load: 0x00000003 -&gt; 0b</span>
+<span id="L72" class="LineNr"> 72 </span><span class="traceContains">+load: 0x00000004 -&gt; 0c</span>
+<span id="L73" class="LineNr"> 73 </span><span class="traceContains">+load: 0x00000005 -&gt; 0d</span>
+<span id="L74" class="LineNr"> 74 </span><span class="traceContains">+run: add <a href='011run.cc.html#L253'>imm32</a> 0x0d0c0b0a to <a href='010vm.cc.html#L23'>reg</a> <a href='010vm.cc.html#L13'>EAX</a></span>
+<span id="L75" class="LineNr"> 75 </span><span class="traceContains">+run: storing 0x0d0c0b0a</span>
+<span id="L76" class="LineNr"> 76 </span>
+<span id="L77" class="LineNr"> 77 </span><span class="Delimiter">:(code)</span>
+<span id="L78" class="LineNr"> 78 </span><span class="Comment">// top-level helper for scenarios: parse the input, transform any macros, load</span>
+<span id="L79" class="LineNr"> 79 </span><span class="Comment">// the final hex bytes into memory, run it</span>
+<span id="L80" class="LineNr"> 80 </span><span class="Normal">void</span> <a href='011run.cc.html#L80'>run</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L81" class="LineNr"> 81 </span>  <a href='011run.cc.html#L96'>program</a> p<span class="Delimiter">;</span>
+<span id="L82" class="LineNr"> 82 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
+<span id="L83" class="LineNr"> 83 </span>  <a href='011run.cc.html#L124'>parse</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
+<span id="L84" class="LineNr"> 84 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L210'>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="L85" class="LineNr"> 85 </span>  transform<span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L210'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L87" class="LineNr"> 87 </span>  <a href='011run.cc.html#L195'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L88" class="LineNr"> 88 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L210'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L89" class="LineNr"> 89 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010vm.cc.html#L29'>EIP</a> &lt; <a href='010vm.cc.html#L95'>End_of_program</a><span class="Delimiter">)</span>
+<span id="L90" class="LineNr"> 90 </span>    <a href='010vm.cc.html#L147'>run_one_instruction</a><span class="Delimiter">();</span>
+<span id="L91" class="LineNr"> 91 </span><span class="Delimiter">}</span>
 <span id="L92" class="LineNr"> 92 </span>
-<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L94" class="LineNr"> 94 </span><span class="Normal">struct</span> <a href='011run.cc.html#L94'>program</a> <span class="Delimiter">{</span>
-<span id="L95" class="LineNr"> 95 </span>  vector&lt;segment&gt; <a href='011run.cc.html#L95'>segments</a><span class="Delimiter">;</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Comment">// random ideas for other things we may eventually need</span>
-<span id="L97" class="LineNr"> 97 </span>  <span class="Comment">//map&lt;name, address&gt; globals;</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="Comment">//vector&lt;recipe&gt; recipes;</span>
-<span id="L99" class="LineNr"> 99 </span>  <span class="Comment">//map&lt;string, type_info&gt; types;</span>
-<span id="L100" class="LineNr">100 </span><span class="Delimiter">};</span>
-<span id="L101" class="LineNr">101 </span><span class="Delimiter">:(before &quot;struct program&quot;)</span>
-<span id="L102" class="LineNr">102 </span><span class="Normal">struct</span> segment <span class="Delimiter">{</span>
-<span id="L103" class="LineNr">103 </span>  <span class="Normal">uint32_t</span> <a href='011run.cc.html#L103'>start</a><span class="Delimiter">;</span>
-<span id="L104" class="LineNr">104 </span>  vector&lt;line&gt; <a href='011run.cc.html#L104'>lines</a><span class="Delimiter">;</span>
-<span id="L105" class="LineNr">105 </span>  segment<span class="Delimiter">()</span> :<a href='011run.cc.html#L103'>start</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L106" class="LineNr">106 </span><span class="Delimiter">};</span>
-<span id="L107" class="LineNr">107 </span><span class="Delimiter">:(before &quot;struct segment&quot;)</span>
-<span id="L108" class="LineNr">108 </span><span class="Normal">struct</span> <a href='011run.cc.html#L108'>line</a> <span class="Delimiter">{</span>
-<span id="L109" class="LineNr">109 </span>  vector&lt;word&gt; <a href='011run.cc.html#L109'>words</a><span class="Delimiter">;</span>
-<span id="L110" class="LineNr">110 </span>  vector&lt;string&gt; metadata<span class="Delimiter">;</span>
-<span id="L111" class="LineNr">111 </span><span class="Delimiter">};</span>
-<span id="L112" class="LineNr">112 </span><span class="Delimiter">:(before &quot;struct line&quot;)</span>
-<span id="L113" class="LineNr">113 </span><span class="Normal">struct</span> <a href='011run.cc.html#L113'>word</a> <span class="Delimiter">{</span>
-<span id="L114" class="LineNr">114 </span>  string <a href='011run.cc.html#L114'>original</a><span class="Delimiter">;</span>
-<span id="L115" class="LineNr">115 </span>  string <a href='011run.cc.html#L115'>data</a><span class="Delimiter">;</span>
-<span id="L116" class="LineNr">116 </span>  vector&lt;string&gt; metadata<span class="Delimiter">;</span>
-<span id="L117" class="LineNr">117 </span><span class="Delimiter">};</span>
-<span id="L118" class="LineNr">118 </span>
-<span id="L119" class="LineNr">119 </span><span class="SalientComment">//:: parse</span>
+<span id="L93" class="LineNr"> 93 </span><span class="SalientComment">//:: core data structures</span>
+<span id="L94" class="LineNr"> 94 </span>
+<span id="L95" class="LineNr"> 95 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L96" class="LineNr"> 96 </span><span class="Normal">struct</span> <a href='011run.cc.html#L96'>program</a> <span class="Delimiter">{</span>
+<span id="L97" class="LineNr"> 97 </span>  vector&lt;segment&gt; <a href='011run.cc.html#L97'>segments</a><span class="Delimiter">;</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="Comment">// random ideas for other things we may eventually need</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="Comment">//map&lt;name, address&gt; globals;</span>
+<span id="L100" class="LineNr">100 </span>  <span class="Comment">//vector&lt;recipe&gt; recipes;</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Comment">//map&lt;string, type_info&gt; types;</span>
+<span id="L102" class="LineNr">102 </span><span class="Delimiter">};</span>
+<span id="L103" class="LineNr">103 </span><span class="Delimiter">:(before &quot;struct program&quot;)</span>
+<span id="L104" class="LineNr">104 </span><span class="Normal">struct</span> segment <span class="Delimiter">{</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Normal">uint32_t</span> <a href='011run.cc.html#L105'>start</a><span class="Delimiter">;</span>
+<span id="L106" class="LineNr">106 </span>  vector&lt;line&gt; <a href='011run.cc.html#L106'>lines</a><span class="Delimiter">;</span>
+<span id="L107" class="LineNr">107 </span>  segment<span class="Delimiter">()</span> :<a href='011run.cc.html#L105'>start</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L108" class="LineNr">108 </span><span class="Delimiter">};</span>
+<span id="L109" class="LineNr">109 </span><span class="Delimiter">:(before &quot;struct segment&quot;)</span>
+<span id="L110" class="LineNr">110 </span><span class="Normal">struct</span> <a href='011run.cc.html#L110'>line</a> <span class="Delimiter">{</span>
+<span id="L111" class="LineNr">111 </span>  vector&lt;word&gt; <a href='011run.cc.html#L111'>words</a><span class="Delimiter">;</span>
+<span id="L112" class="LineNr">112 </span>  vector&lt;string&gt; metadata<span class="Delimiter">;</span>
+<span id="L113" class="LineNr">113 </span><span class="Delimiter">};</span>
+<span id="L114" class="LineNr">114 </span><span class="Delimiter">:(before &quot;struct line&quot;)</span>
+<span id="L115" class="LineNr">115 </span><span class="Normal">struct</span> <a href='011run.cc.html#L115'>word</a> <span class="Delimiter">{</span>
+<span id="L116" class="LineNr">116 </span>  string <a href='011run.cc.html#L116'>original</a><span class="Delimiter">;</span>
+<span id="L117" class="LineNr">117 </span>  string <a href='011run.cc.html#L117'>data</a><span class="Delimiter">;</span>
+<span id="L118" class="LineNr">118 </span>  vector&lt;string&gt; metadata<span class="Delimiter">;</span>
+<span id="L119" class="LineNr">119 </span><span class="Delimiter">};</span>
 <span id="L120" class="LineNr">120 </span>
-<span id="L121" class="LineNr">121 </span><span class="Delimiter">:(code)</span>
-<span id="L122" class="LineNr">122 </span><span class="Normal">void</span> <a href='011run.cc.html#L122'>parse</a><span class="Delimiter">(</span>istream&amp; fin<span class="Delimiter">,</span> program&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L123" class="LineNr">123 </span>  vector&lt;line&gt; l<span class="Delimiter">;</span>
-<span id="L124" class="LineNr">124 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L125" class="LineNr">125 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>has_data</a><span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L126" class="LineNr">126 </span>    string line_data<span class="Delimiter">;</span>
-<span id="L127" class="LineNr">127 </span>    getline<span class="Delimiter">(</span>fin<span class="Delimiter">,</span> line_data<span class="Delimiter">);</span>
-<span id="L128" class="LineNr">128 </span>    <a href='003trace.cc.html#L189'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L129" class="LineNr">129 </span>    istringstream lin<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span>
-<span id="L130" class="LineNr">130 </span>    vector&lt;word&gt; w<span class="Delimiter">;</span>
-<span id="L131" class="LineNr">131 </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="L132" class="LineNr">132 </span>      string word_data<span class="Delimiter">;</span>
-<span id="L133" class="LineNr">133 </span>      lin &gt;&gt; word_data<span class="Delimiter">;</span>
-<span id="L134" class="LineNr">134 </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="L135" class="LineNr">135 </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="L136" class="LineNr">136 </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="L137" class="LineNr">137 </span>          assert<span class="Delimiter">(</span>!out<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L138" class="LineNr">138 </span>          <a href='003trace.cc.html#L189'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L139" class="LineNr">139 </span>          out<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>l<span class="Delimiter">);</span>
-<span id="L140" class="LineNr">140 </span>        <span class="Delimiter">}</span>
-<span id="L141" class="LineNr">141 </span>        segment s<span class="Delimiter">;</span>
-<span id="L142" class="LineNr">142 </span>        lin &gt;&gt; std::hex &gt;&gt; s<span class="Delimiter">.</span><a href='011run.cc.html#L103'>start</a><span class="Delimiter">;</span>
-<span id="L143" class="LineNr">143 </span>        <a href='003trace.cc.html#L189'>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='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; s<span class="Delimiter">.</span><a href='011run.cc.html#L103'>start</a> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L144" class="LineNr">144 </span>        out<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
-<span id="L145" class="LineNr">145 </span>        <span class="Comment">// todo?</span>
-<span id="L146" class="LineNr">146 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// skip rest of line</span>
-<span id="L147" class="LineNr">147 </span>      <span class="Delimiter">}</span>
-<span id="L148" class="LineNr">148 </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="L149" class="LineNr">149 </span>        <span class="Comment">// todo: line metadata</span>
-<span id="L150" class="LineNr">150 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L121" class="LineNr">121 </span><span class="SalientComment">//:: parse</span>
+<span id="L122" class="LineNr">122 </span>
+<span id="L123" class="LineNr">123 </span><span class="Delimiter">:(code)</span>
+<span id="L124" class="LineNr">124 </span><span class="Normal">void</span> <a href='011run.cc.html#L124'>parse</a><span class="Delimiter">(</span>istream&amp; fin<span class="Delimiter">,</span> program&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L125" class="LineNr">125 </span>  vector&lt;line&gt; l<span class="Delimiter">;</span>
+<span id="L126" class="LineNr">126 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L127" class="LineNr">127 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>has_data</a><span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L128" class="LineNr">128 </span>    string line_data<span class="Delimiter">;</span>
+<span id="L129" class="LineNr">129 </span>    getline<span class="Delimiter">(</span>fin<span class="Delimiter">,</span> line_data<span class="Delimiter">);</span>
+<span id="L130" class="LineNr">130 </span>    <a href='003trace.cc.html#L190'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L131" class="LineNr">131 </span>    istringstream lin<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span>
+<span id="L132" class="LineNr">132 </span>    vector&lt;word&gt; w<span class="Delimiter">;</span>
+<span id="L133" class="LineNr">133 </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="L134" class="LineNr">134 </span>      string word_data<span class="Delimiter">;</span>
+<span id="L135" class="LineNr">135 </span>      lin &gt;&gt; word_data<span class="Delimiter">;</span>
+<span id="L136" class="LineNr">136 </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="L137" class="LineNr">137 </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="L138" class="LineNr">138 </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="L139" class="LineNr">139 </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="L140" class="LineNr">140 </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="L141" class="LineNr">141 </span>          assert<span class="Delimiter">(</span>!out<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L142" class="LineNr">142 </span>          <a href='003trace.cc.html#L190'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L143" class="LineNr">143 </span>          out<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>l<span class="Delimiter">);</span>
+<span id="L144" class="LineNr">144 </span>        <span class="Delimiter">}</span>
+<span id="L145" class="LineNr">145 </span>        segment s<span class="Delimiter">;</span>
+<span id="L146" class="LineNr">146 </span>        lin &gt;&gt; std::hex &gt;&gt; s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a><span class="Delimiter">;</span>
+<span id="L147" class="LineNr">147 </span>        <a href='003trace.cc.html#L190'>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='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L148" class="LineNr">148 </span>        out<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L149" class="LineNr">149 </span>        <span class="Comment">// todo?</span>
+<span id="L150" class="LineNr">150 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// skip rest of line</span>
 <span id="L151" class="LineNr">151 </span>      <span class="Delimiter">}</span>
-<span id="L152" class="LineNr">152 </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="L153" class="LineNr">153 </span>        <span class="Comment">// comment</span>
+<span id="L152" class="LineNr">152 </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="L153" class="LineNr">153 </span>        <span class="Comment">// todo: line metadata</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>      w<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L113'>word</a><span class="Delimiter">());</span>
-<span id="L157" class="LineNr">157 </span>      w<span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L114'>original</a> = word_data<span class="Delimiter">;</span>
+<span id="L156" class="LineNr">156 </span>      w<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L115'>word</a><span class="Delimiter">());</span>
+<span id="L157" class="LineNr">157 </span>      w<span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L116'>original</a> = word_data<span class="Delimiter">;</span>
 <span id="L158" class="LineNr">158 </span>      istringstream win<span class="Delimiter">(</span>word_data<span class="Delimiter">);</span>
-<span id="L159" class="LineNr">159 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>getline<span class="Delimiter">(</span>win<span class="Delimiter">,</span> w<span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L159" class="LineNr">159 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>getline<span class="Delimiter">(</span>win<span class="Delimiter">,</span> w<span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L160" class="LineNr">160 </span>        string m<span class="Delimiter">;</span>
 <span id="L161" class="LineNr">161 </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="L162" class="LineNr">162 </span>          w<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="L163" class="LineNr">163 </span>      <span class="Delimiter">}</span>
-<span id="L164" class="LineNr">164 </span>      <a href='003trace.cc.html#L189'>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#L113'>word</a>: &quot;</span> &lt;&lt; w<span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L115'>data</a> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L164" class="LineNr">164 </span>      <a href='003trace.cc.html#L190'>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#L115'>word</a>: &quot;</span> &lt;&lt; w<span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L117'>data</a> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L165" class="LineNr">165 </span>    <span class="Delimiter">}</span>
 <span id="L166" class="LineNr">166 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!w<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L167" class="LineNr">167 </span>      l<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L108'>line</a><span class="Delimiter">());</span>
-<span id="L168" class="LineNr">168 </span>      l<span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>w<span class="Delimiter">);</span>
+<span id="L167" class="LineNr">167 </span>      l<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L110'>line</a><span class="Delimiter">());</span>
+<span id="L168" class="LineNr">168 </span>      l<span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>w<span class="Delimiter">);</span>
 <span id="L169" class="LineNr">169 </span>    <span class="Delimiter">}</span>
 <span id="L170" class="LineNr">170 </span>  <span class="Delimiter">}</span>
 <span id="L171" class="LineNr">171 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!l<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L172" class="LineNr">172 </span>    assert<span class="Delimiter">(</span>!out<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L173" class="LineNr">173 </span>    <a href='003trace.cc.html#L189'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L174" class="LineNr">174 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>l<span class="Delimiter">);</span>
+<span id="L172" class="LineNr">172 </span>    assert<span class="Delimiter">(</span>!out<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L173" class="LineNr">173 </span>    <a href='003trace.cc.html#L190'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L174" class="LineNr">174 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>l<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#L189'>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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L176" class="LineNr">176 </span>  <a href='003trace.cc.html#L190'>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#L215'>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 id="L179" class="LineNr">179 </span><span class="SalientComment">//:: transform</span>
@@ -246,39 +246,39 @@ if ('onhashchange' in window) {
 <span id="L184" class="LineNr">184 </span>vector&lt;transform_fn&gt; <a href='011run.cc.html#L184'>Transform</a><span class="Delimiter">;</span>
 <span id="L185" class="LineNr">185 </span>
 <span id="L186" class="LineNr">186 </span><span class="Normal">void</span> transform<span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L187" class="LineNr">187 </span>  <a href='003trace.cc.html#L189'>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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L187" class="LineNr">187 </span>  <a href='003trace.cc.html#L190'>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#L215'>end</a><span class="Delimiter">();</span>
 <span id="L188" class="LineNr">188 </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#L184'>Transform</a><span class="Delimiter">);</span>  ++t<span class="Delimiter">)</span>
 <span id="L189" class="LineNr">189 </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="L190" class="LineNr">190 </span>  <a href='003trace.cc.html#L189'>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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L190" class="LineNr">190 </span>  <a href='003trace.cc.html#L190'>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#L215'>end</a><span class="Delimiter">();</span>
 <span id="L191" class="LineNr">191 </span><span class="Delimiter">}</span>
 <span id="L192" class="LineNr">192 </span>
 <span id="L193" class="LineNr">193 </span><span class="SalientComment">//:: load</span>
 <span id="L194" class="LineNr">194 </span>
 <span id="L195" class="LineNr">195 </span><span class="Normal">void</span> <a href='011run.cc.html#L195'>load</a><span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L196" class="LineNr">196 </span>  <a href='003trace.cc.html#L189'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L197" class="LineNr">197 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L198" class="LineNr">198 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;no code to <a href='011run.cc.html#L78'>run</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L196" class="LineNr">196 </span>  <a href='003trace.cc.html#L190'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L197" class="LineNr">197 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L198" class="LineNr">198 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;no code to <a href='011run.cc.html#L80'>run</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L199" class="LineNr">199 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L200" class="LineNr">200 </span>  <span class="Delimiter">}</span>
-<span id="L201" class="LineNr">201 </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#L95'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L202" class="LineNr">202 </span>    <span class="Normal">const</span> segment&amp; seg = p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L203" class="LineNr">203 </span>    <span class="Normal">uint32_t</span> addr = seg<span class="Delimiter">.</span><a href='011run.cc.html#L103'>start</a><span class="Delimiter">;</span>
-<span id="L204" class="LineNr">204 </span>    <a href='003trace.cc.html#L189'>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='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L205" class="LineNr">205 </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#L104'>lines</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L206" class="LineNr">206 </span>      <span class="Normal">const</span> line&amp; l = seg<span class="Delimiter">.</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L207" class="LineNr">207 </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#L109'>words</a><span class="Delimiter">);</span>  ++k<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L208" class="LineNr">208 </span>        <span class="Normal">const</span> word&amp; w = l<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>k<span class="Delimiter">);</span>
-<span id="L209" class="LineNr">209 </span>        <span class="Normal">uint8_t</span> val = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">);</span>
-<span id="L210" class="LineNr">210 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L208'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L201" class="LineNr">201 </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#L97'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L202" class="LineNr">202 </span>    <span class="Normal">const</span> segment&amp; seg = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L203" class="LineNr">203 </span>    <span class="Normal">uint32_t</span> addr = seg<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a><span class="Delimiter">;</span>
+<span id="L204" class="LineNr">204 </span>    <a href='003trace.cc.html#L190'>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='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L205" class="LineNr">205 </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#L106'>lines</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L206" class="LineNr">206 </span>      <span class="Normal">const</span> line&amp; l = seg<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L207" class="LineNr">207 </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#L111'>words</a><span class="Delimiter">);</span>  ++k<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L208" class="LineNr">208 </span>        <span class="Normal">const</span> word&amp; w = l<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>k<span class="Delimiter">);</span>
+<span id="L209" class="LineNr">209 </span>        <span class="Normal">uint8_t</span> val = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">);</span>
+<span id="L210" class="LineNr">210 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L210'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L211" class="LineNr">211 </span>        <a href='010vm.cc.html#L130'>write_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
-<span id="L212" class="LineNr">212 </span>        <a href='003trace.cc.html#L189'>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='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010vm.cc.html#L227'>HEXBYTE</a> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span><a href='010vm.cc.html#L104'>read_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L212" class="LineNr">212 </span>        <a href='003trace.cc.html#L190'>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='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010vm.cc.html#L238'>HEXBYTE</a> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span><a href='010vm.cc.html#L104'>read_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L213" class="LineNr">213 </span>        ++addr<span class="Delimiter">;</span>
 <span id="L214" class="LineNr">214 </span>      <span class="Delimiter">}</span>
 <span id="L215" class="LineNr">215 </span>    <span class="Delimiter">}</span>
 <span id="L216" class="LineNr">216 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> <a href='010vm.cc.html#L95'>End_of_program</a> = addr<span class="Delimiter">;</span>
 <span id="L217" class="LineNr">217 </span>  <span class="Delimiter">}</span>
-<span id="L218" class="LineNr">218 </span>  <a href='010vm.cc.html#L29'>EIP</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>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#L103'>start</a><span class="Delimiter">;</span>
-<span id="L219" class="LineNr">219 </span>  <a href='003trace.cc.html#L189'>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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L218" class="LineNr">218 </span>  <a href='010vm.cc.html#L29'>EIP</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>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#L105'>start</a><span class="Delimiter">;</span>
+<span id="L219" class="LineNr">219 </span>  <a href='003trace.cc.html#L190'>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#L215'>end</a><span class="Delimiter">();</span>
 <span id="L220" class="LineNr">220 </span><span class="Delimiter">}</span>
 <span id="L221" class="LineNr">221 </span>
 <span id="L222" class="LineNr">222 </span><span class="Normal">uint8_t</span> <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -286,11 +286,11 @@ if ('onhashchange' in window) {
 <span id="L224" class="LineNr">224 </span>  <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L225" class="LineNr">225 </span>  in &gt;&gt; std::hex &gt;&gt; result<span class="Delimiter">;</span>
 <span id="L226" class="LineNr">226 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L227" class="LineNr">227 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid hex &quot;</span> &lt;&lt; s &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L227" class="LineNr">227 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid hex &quot;</span> &lt;&lt; s &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L228" class="LineNr">228 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
 <span id="L229" class="LineNr">229 </span>  <span class="Delimiter">}</span>
 <span id="L230" class="LineNr">230 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result &gt; <span class="Constant">0xff</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L231" class="LineNr">231 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid hex byte &quot;</span> &lt;&lt; std::hex &lt;&lt; result &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L231" class="LineNr">231 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid hex byte &quot;</span> &lt;&lt; std::hex &lt;&lt; result &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L232" class="LineNr">232 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
 <span id="L233" class="LineNr">233 </span>  <span class="Delimiter">}</span>
 <span id="L234" class="LineNr">234 </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>
@@ -299,13 +299,13 @@ if ('onhashchange' in window) {
 <span id="L237" class="LineNr">237 </span><span class="SalientComment">//:: run</span>
 <span id="L238" class="LineNr">238 </span>
 <span id="L239" class="LineNr">239 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L240" class="LineNr">240 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add <a href='011run.cc.html#L253'>imm32</a> to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L240" class="LineNr">240 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add <a href='011run.cc.html#L253'>imm32</a> to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
 <span id="L241" class="LineNr">241 </span>
 <span id="L242" class="LineNr">242 </span><span class="Comment">//: our first opcode</span>
 <span id="L243" class="LineNr">243 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L244" class="LineNr">244 </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="L245" class="LineNr">245 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L253'>imm32</a><span class="Delimiter">();</span>
-<span id="L246" class="LineNr">246 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to <a href='010vm.cc.html#L23'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L246" class="LineNr">246 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to <a href='010vm.cc.html#L23'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L247" class="LineNr">247 </span>  <a href='010vm.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="L248" class="LineNr">248 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L249" class="LineNr">249 </span><span class="Delimiter">}</span>
@@ -313,10 +313,10 @@ if ('onhashchange' in window) {
 <span id="L251" class="LineNr">251 </span><span class="Delimiter">:(code)</span>
 <span id="L252" class="LineNr">252 </span><span class="Comment">// read a 32-bit immediate in little-endian order from the instruction stream</span>
 <span id="L253" class="LineNr">253 </span><span class="Normal">int32_t</span> <a href='011run.cc.html#L253'>imm32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L254" class="LineNr">254 </span>  <span class="Normal">int32_t</span> result = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
-<span id="L255" class="LineNr">255 </span>  result |= <span class="Delimiter">(</span><a href='010vm.cc.html#L190'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
-<span id="L256" class="LineNr">256 </span>  result |= <span class="Delimiter">(</span><a href='010vm.cc.html#L190'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
-<span id="L257" class="LineNr">257 </span>  result |= <span class="Delimiter">(</span><a href='010vm.cc.html#L190'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">24</span><span class="Delimiter">);</span>
+<span id="L254" class="LineNr">254 </span>  <span class="Normal">int32_t</span> result = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
+<span id="L255" class="LineNr">255 </span>  result |= <span class="Delimiter">(</span><a href='010vm.cc.html#L193'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L256" class="LineNr">256 </span>  result |= <span class="Delimiter">(</span><a href='010vm.cc.html#L193'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
+<span id="L257" class="LineNr">257 </span>  result |= <span class="Delimiter">(</span><a href='010vm.cc.html#L193'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">24</span><span class="Delimiter">);</span>
 <span id="L258" class="LineNr">258 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L259" class="LineNr">259 </span><span class="Delimiter">}</span>
 </pre>
diff --git a/html/subx/020elf.cc.html b/html/subx/012elf.cc.html
index 68de155d..554ebed9 100644
--- a/html/subx/020elf.cc.html
+++ b/html/subx/012elf.cc.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/020elf.cc</title>
+<title>Mu - subx/012elf.cc</title>
 <meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
@@ -63,91 +63,91 @@ if ('onhashchange' in window) {
 <span id="L4" class="LineNr">  4 </span><span class="Delimiter">:(before &quot;End Main&quot;)</span>
 <span id="L5" class="LineNr">  5 </span>assert<span class="Delimiter">(</span>argc &gt; <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L6" class="LineNr">  6 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L7" class="LineNr">  7 </span>  <a href='003trace.cc.html#L236'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span>
+<span id="L7" class="LineNr">  7 </span>  <a href='003trace.cc.html#L238'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span>
 <span id="L8" class="LineNr">  8 </span>  assert<span class="Delimiter">(</span>argc &gt; <span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L9" class="LineNr">  9 </span>  <a href='000organization.cc.html#L148'>reset</a><span class="Delimiter">();</span>
 <span id="L10" class="LineNr"> 10 </span>  cerr &lt;&lt; std::hex<span class="Delimiter">;</span>
-<span id="L11" class="LineNr"> 11 </span>  <a href='020elf.cc.html#L108'>initialize_mem</a><span class="Delimiter">();</span>
-<span id="L12" class="LineNr"> 12 </span>  <a href='010vm.cc.html#L94'>Mem_offset</a> = <a href='020elf.cc.html#L104'>CODE_START</a><span class="Delimiter">;</span>
-<span id="L13" class="LineNr"> 13 </span>  <a href='020elf.cc.html#L21'>load_elf</a><span class="Delimiter">(</span>argv[<span class="Constant">2</span>]<span class="Delimiter">);</span>
+<span id="L11" class="LineNr"> 11 </span>  <a href='012elf.cc.html#L108'>initialize_mem</a><span class="Delimiter">();</span>
+<span id="L12" class="LineNr"> 12 </span>  <a href='010vm.cc.html#L94'>Mem_offset</a> = <a href='012elf.cc.html#L104'>CODE_START</a><span class="Delimiter">;</span>
+<span id="L13" class="LineNr"> 13 </span>  <a href='012elf.cc.html#L21'>load_elf</a><span class="Delimiter">(</span>argv[<span class="Constant">2</span>]<span class="Delimiter">);</span>
 <span id="L14" class="LineNr"> 14 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010vm.cc.html#L29'>EIP</a> &lt; <a href='010vm.cc.html#L95'>End_of_program</a><span class="Delimiter">)</span>  <span class="Comment">// weak final-gasp termination check</span>
 <span id="L15" class="LineNr"> 15 </span>    <a href='010vm.cc.html#L147'>run_one_instruction</a><span class="Delimiter">();</span>
-<span id="L16" class="LineNr"> 16 </span>  <a href='003trace.cc.html#L192'>dbg</a> &lt;&lt; <span class="Constant">&quot;executed past <a href='003trace.cc.html#L213'>end</a> of the world: &quot;</span> &lt;&lt; <a href='010vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='010vm.cc.html#L95'>End_of_program</a> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L16" class="LineNr"> 16 </span>  <a href='003trace.cc.html#L193'>dbg</a> &lt;&lt; <span class="Constant">&quot;executed past <a href='003trace.cc.html#L215'>end</a> of the world: &quot;</span> &lt;&lt; <a href='010vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='010vm.cc.html#L95'>End_of_program</a> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L17" class="LineNr"> 17 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L18" class="LineNr"> 18 </span><span class="Delimiter">}</span>
 <span id="L19" class="LineNr"> 19 </span>
 <span id="L20" class="LineNr"> 20 </span><span class="Delimiter">:(code)</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Normal">void</span> <a href='020elf.cc.html#L21'>load_elf</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; filename<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Normal">void</span> <a href='012elf.cc.html#L21'>load_elf</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; filename<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L22" class="LineNr"> 22 </span>  <span class="Normal">int</span> fd = open<span class="Delimiter">(</span>filename<span class="Delimiter">.</span>c_str<span class="Delimiter">(),</span> O_RDONLY<span class="Delimiter">);</span>
-<span id="L23" class="LineNr"> 23 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>fd &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; filename<span class="Delimiter">.</span>c_str<span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;: open&quot;</span> &lt;&lt; <a href='020elf.cc.html#L121'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='020elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
+<span id="L23" class="LineNr"> 23 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>fd &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; filename<span class="Delimiter">.</span>c_str<span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;: open&quot;</span> &lt;&lt; <a href='012elf.cc.html#L121'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Normal">off_t</span> size = lseek<span class="Delimiter">(</span>fd<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">SEEK_END</span><span class="Delimiter">);</span>
 <span id="L25" class="LineNr"> 25 </span>  lseek<span class="Delimiter">(</span>fd<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">SEEK_SET</span><span class="Delimiter">);</span>
 <span id="L26" class="LineNr"> 26 </span>  <span class="Normal">uint8_t</span>* elf_contents = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span>malloc<span class="Delimiter">(</span>size<span class="Delimiter">));</span>
-<span id="L27" class="LineNr"> 27 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents == <span class="Constant">NULL</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;malloc(&quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='020elf.cc.html#L121'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='020elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
+<span id="L27" class="LineNr"> 27 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents == <span class="Constant">NULL</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;malloc(&quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='012elf.cc.html#L121'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Normal">ssize_t</span> read_size = read<span class="Delimiter">(</span>fd<span class="Delimiter">,</span> elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">);</span>
-<span id="L29" class="LineNr"> 29 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size != read_size<span class="Delimiter">)</span> <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;read → &quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">&quot; (!= &quot;</span> &lt;&lt; read_size &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='020elf.cc.html#L121'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='020elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
-<span id="L30" class="LineNr"> 30 </span>  <a href='020elf.cc.html#L34'>load_elf_contents</a><span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">);</span>
+<span id="L29" class="LineNr"> 29 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size != read_size<span class="Delimiter">)</span> <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;read → &quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">&quot; (!= &quot;</span> &lt;&lt; read_size &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='012elf.cc.html#L121'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
+<span id="L30" class="LineNr"> 30 </span>  <a href='012elf.cc.html#L34'>load_elf_contents</a><span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">);</span>
 <span id="L31" class="LineNr"> 31 </span>  free<span class="Delimiter">(</span>elf_contents<span class="Delimiter">);</span>
 <span id="L32" class="LineNr"> 32 </span><span class="Delimiter">}</span>
 <span id="L33" class="LineNr"> 33 </span>
-<span id="L34" class="LineNr"> 34 </span><span class="Normal">void</span> <a href='020elf.cc.html#L34'>load_elf_contents</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* elf_contents<span class="Delimiter">,</span> <span class="Normal">size_t</span> size<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L34" class="LineNr"> 34 </span><span class="Normal">void</span> <a href='012elf.cc.html#L34'>load_elf_contents</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* elf_contents<span class="Delimiter">,</span> <span class="Normal">size_t</span> size<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Normal">uint8_t</span> magic[<span class="Constant">5</span>] = <span class="Delimiter">{</span><span class="Constant">0</span><span class="Delimiter">};</span>
 <span id="L36" class="LineNr"> 36 </span>  memcpy<span class="Delimiter">(</span>magic<span class="Delimiter">,</span> elf_contents<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">);</span>
 <span id="L37" class="LineNr"> 37 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>memcmp<span class="Delimiter">(</span>magic<span class="Delimiter">,</span> <span class="Constant">&quot;</span><span class="cSpecial">\177</span><span class="Constant">ELF&quot;</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">)</span> != <span class="Constant">0</span><span class="Delimiter">)</span>
-<span id="L38" class="LineNr"> 38 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid ELF file; starts with </span><span class="cSpecial">\&quot;</span><span class="Constant">&quot;</span> &lt;&lt; magic &lt;&lt; <span class="Constant">'&quot;'</span> &lt;&lt; <a href='020elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
+<span id="L38" class="LineNr"> 38 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid ELF file; starts with </span><span class="cSpecial">\&quot;</span><span class="Constant">&quot;</span> &lt;&lt; magic &lt;&lt; <span class="Constant">'&quot;'</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents[<span class="Constant">4</span>] != <span class="Constant">1</span><span class="Delimiter">)</span>
-<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;Only 32-bit ELF files (4-byte words; virtual addresses up to 4GB) supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='020elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
+<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;Only 32-bit ELF files (4-byte words; virtual addresses up to 4GB) supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
 <span id="L41" class="LineNr"> 41 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents[<span class="Constant">5</span>] != <span class="Constant">1</span><span class="Delimiter">)</span>
-<span id="L42" class="LineNr"> 42 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;Only little-endian ELF files supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='020elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
+<span id="L42" class="LineNr"> 42 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;Only little-endian ELF files supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
 <span id="L43" class="LineNr"> 43 </span>  <span class="Comment">// unused: remaining 10 bytes of e_ident</span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Normal">uint32_t</span> e_machine_type = <a href='020elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">16</span>]<span class="Delimiter">);</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="Normal">uint32_t</span> e_machine_type = <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">16</span>]<span class="Delimiter">);</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_machine_type != <span class="Constant">0x00030002</span><span class="Delimiter">)</span>
-<span id="L46" class="LineNr"> 46 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;ELF type/machine 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; e_machine_type &lt;&lt; <span class="Constant">&quot; isn't i386 executable</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
+<span id="L46" class="LineNr"> 46 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;ELF type/machine 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; e_machine_type &lt;&lt; <span class="Constant">&quot; isn't i386 executable</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Comment">// unused: e_version. We only support version 1, and later versions will be backwards compatible.</span>
-<span id="L48" class="LineNr"> 48 </span>  <span class="Normal">uint32_t</span> e_entry = <a href='020elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">24</span>]<span class="Delimiter">);</span>
-<span id="L49" class="LineNr"> 49 </span>  <span class="Normal">uint32_t</span> e_phoff = <a href='020elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">28</span>]<span class="Delimiter">);</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="Normal">uint32_t</span> e_entry = <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">24</span>]<span class="Delimiter">);</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="Normal">uint32_t</span> e_phoff = <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">28</span>]<span class="Delimiter">);</span>
 <span id="L50" class="LineNr"> 50 </span>  <span class="Comment">// unused: e_shoff</span>
 <span id="L51" class="LineNr"> 51 </span>  <span class="Comment">// unused: e_flags</span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="Normal">uint32_t</span> e_ehsize = <a href='020elf.cc.html#L116'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">40</span>]<span class="Delimiter">);</span>
-<span id="L53" class="LineNr"> 53 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &lt; <span class="Constant">52</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; ELF header too small</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='020elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
-<span id="L54" class="LineNr"> 54 </span>  <span class="Normal">uint32_t</span> e_phentsize = <a href='020elf.cc.html#L116'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">42</span>]<span class="Delimiter">);</span>
-<span id="L55" class="LineNr"> 55 </span>  <span class="Normal">uint32_t</span> e_phnum = <a href='020elf.cc.html#L116'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">44</span>]<span class="Delimiter">);</span>
-<span id="L56" class="LineNr"> 56 </span>  <a href='003trace.cc.html#L192'>dbg</a> &lt;&lt; e_phnum &lt;&lt; <span class="Constant">&quot; entries in the <a href='011run.cc.html#L94'>program</a> header, each &quot;</span> &lt;&lt; e_phentsize &lt;&lt; <span class="Constant">&quot; bytes long&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Normal">uint32_t</span> e_ehsize = <a href='012elf.cc.html#L116'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">40</span>]<span class="Delimiter">);</span>
+<span id="L53" class="LineNr"> 53 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &lt; <span class="Constant">52</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; ELF header too small</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="Normal">uint32_t</span> e_phentsize = <a href='012elf.cc.html#L116'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">42</span>]<span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="Normal">uint32_t</span> e_phnum = <a href='012elf.cc.html#L116'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">44</span>]<span class="Delimiter">);</span>
+<span id="L56" class="LineNr"> 56 </span>  <a href='003trace.cc.html#L193'>dbg</a> &lt;&lt; e_phnum &lt;&lt; <span class="Constant">&quot; entries in the <a href='011run.cc.html#L96'>program</a> header, each &quot;</span> &lt;&lt; e_phentsize &lt;&lt; <span class="Constant">&quot; bytes long&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L57" class="LineNr"> 57 </span>  <span class="Comment">// unused: e_shentsize</span>
 <span id="L58" class="LineNr"> 58 </span>  <span class="Comment">// unused: e_shnum</span>
 <span id="L59" class="LineNr"> 59 </span>  <span class="Comment">// unused: e_shstrndx</span>
 <span id="L60" class="LineNr"> 60 </span>
 <span id="L61" class="LineNr"> 61 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; e_phnum<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span>
-<span id="L62" class="LineNr"> 62 </span>    <a href='020elf.cc.html#L70'>load_segment_from_program_header</a><span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">,</span> e_phoff + i*e_phentsize<span class="Delimiter">,</span> e_ehsize<span class="Delimiter">);</span>
+<span id="L62" class="LineNr"> 62 </span>    <a href='012elf.cc.html#L70'>load_segment_from_program_header</a><span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">,</span> e_phoff + i*e_phentsize<span class="Delimiter">,</span> e_ehsize<span class="Delimiter">);</span>
 <span id="L63" class="LineNr"> 63 </span>
 <span id="L64" class="LineNr"> 64 </span>  <span class="Comment">// initialize code and stack</span>
-<span id="L65" class="LineNr"> 65 </span>  Reg[ESP]<span class="Delimiter">.</span>u = <a href='020elf.cc.html#L106'>AFTER_STACK</a><span class="Delimiter">;</span>
+<span id="L65" class="LineNr"> 65 </span>  Reg[ESP]<span class="Delimiter">.</span>u = <a href='012elf.cc.html#L106'>AFTER_STACK</a><span class="Delimiter">;</span>
 <span id="L66" class="LineNr"> 66 </span>  Reg[EBP]<span class="Delimiter">.</span>u = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L67" class="LineNr"> 67 </span>  <a href='010vm.cc.html#L29'>EIP</a> = e_entry<span class="Delimiter">;</span>
 <span id="L68" class="LineNr"> 68 </span><span class="Delimiter">}</span>
 <span id="L69" class="LineNr"> 69 </span>
-<span id="L70" class="LineNr"> 70 </span><span class="Normal">void</span> <a href='020elf.cc.html#L70'>load_segment_from_program_header</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* elf_contents<span class="Delimiter">,</span> <span class="Normal">size_t</span> size<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> offset<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> e_ehsize<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L71" class="LineNr"> 71 </span>  <span class="Normal">uint32_t</span> p_type = <a href='020elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset]<span class="Delimiter">);</span>
-<span id="L72" class="LineNr"> 72 </span>  <a href='003trace.cc.html#L192'>dbg</a> &lt;&lt; <span class="Constant">&quot;program header at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot;: type &quot;</span> &lt;&lt; p_type &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L70" class="LineNr"> 70 </span><span class="Normal">void</span> <a href='012elf.cc.html#L70'>load_segment_from_program_header</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* elf_contents<span class="Delimiter">,</span> <span class="Normal">size_t</span> size<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> offset<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> e_ehsize<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="Normal">uint32_t</span> p_type = <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset]<span class="Delimiter">);</span>
+<span id="L72" class="LineNr"> 72 </span>  <a href='003trace.cc.html#L193'>dbg</a> &lt;&lt; <span class="Constant">&quot;program header at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot;: type &quot;</span> &lt;&lt; p_type &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L73" class="LineNr"> 73 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_type != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L74" class="LineNr"> 74 </span>    <a href='003trace.cc.html#L192'>dbg</a> &lt;&lt; <span class="Constant">&quot;ignoring segment at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; of non PT_LOAD type &quot;</span> &lt;&lt; p_type &lt;&lt; <span class="Constant">&quot; (see <a href="http://refspecs.linuxbase.org/elf/elf.pdf">http://refspecs.linuxbase.org/elf/elf.pdf</a>)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L74" class="LineNr"> 74 </span>    <a href='003trace.cc.html#L193'>dbg</a> &lt;&lt; <span class="Constant">&quot;ignoring segment at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; of non PT_LOAD type &quot;</span> &lt;&lt; p_type &lt;&lt; <span class="Constant">&quot; (see <a href="http://refspecs.linuxbase.org/elf/elf.pdf)">http://refspecs.linuxbase.org/elf/elf.pdf)</a>&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L75" class="LineNr"> 75 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L76" class="LineNr"> 76 </span>  <span class="Delimiter">}</span>
-<span id="L77" class="LineNr"> 77 </span>  <span class="Normal">uint32_t</span> p_offset = <a href='020elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">4</span>]<span class="Delimiter">);</span>
-<span id="L78" class="LineNr"> 78 </span>  <span class="Normal">uint32_t</span> p_vaddr = <a href='020elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">8</span>]<span class="Delimiter">);</span>
-<span id="L79" class="LineNr"> 79 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &gt; p_vaddr<span class="Delimiter">)</span> <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; <a href='011run.cc.html#L94'>program</a> header overlaps ELF header</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='020elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="Normal">uint32_t</span> p_offset = <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">4</span>]<span class="Delimiter">);</span>
+<span id="L78" class="LineNr"> 78 </span>  <span class="Normal">uint32_t</span> p_vaddr = <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">8</span>]<span class="Delimiter">);</span>
+<span id="L79" class="LineNr"> 79 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &gt; p_vaddr<span class="Delimiter">)</span> <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; <a href='011run.cc.html#L96'>program</a> header overlaps ELF header</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
 <span id="L80" class="LineNr"> 80 </span>  <span class="Comment">// unused: p_paddr</span>
-<span id="L81" class="LineNr"> 81 </span>  <span class="Normal">uint32_t</span> p_filesz = <a href='020elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">16</span>]<span class="Delimiter">);</span>
-<span id="L82" class="LineNr"> 82 </span>  <span class="Normal">uint32_t</span> p_memsz = <a href='020elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">20</span>]<span class="Delimiter">);</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Normal">uint32_t</span> p_filesz = <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">16</span>]<span class="Delimiter">);</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="Normal">uint32_t</span> p_memsz = <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">20</span>]<span class="Delimiter">);</span>
 <span id="L83" class="LineNr"> 83 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_filesz != p_memsz<span class="Delimiter">)</span>
-<span id="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;Can't handle segments where p_filesz != p_memsz (see <a href="http://refspecs.linuxbase.org/elf/elf.pdf">http://refspecs.linuxbase.org/elf/elf.pdf</a>)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
+<span id="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;Can't handle segments where p_filesz != p_memsz (see <a href="http://refspecs.linuxbase.org/elf/elf.pdf)">http://refspecs.linuxbase.org/elf/elf.pdf)</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
 <span id="L85" class="LineNr"> 85 </span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_offset + p_filesz &gt; size<span class="Delimiter">)</span>
-<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; segment at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; is too large: wants to <a href='003trace.cc.html#L213'>end</a> at &quot;</span> &lt;&lt; p_offset+p_filesz &lt;&lt; <span class="Constant">&quot; but the file ends at &quot;</span> &lt;&lt; size &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='020elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
+<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; segment at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; is too large: wants to <a href='003trace.cc.html#L215'>end</a> at &quot;</span> &lt;&lt; p_offset+p_filesz &lt;&lt; <span class="Constant">&quot; but the file ends at &quot;</span> &lt;&lt; size &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
 <span id="L88" class="LineNr"> 88 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>size<span class="Delimiter">()</span> &lt; p_vaddr + p_memsz<span class="Delimiter">)</span>
 <span id="L89" class="LineNr"> 89 </span>    <a href='010vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span>p_vaddr + p_memsz<span class="Delimiter">);</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size &gt; p_memsz<span class="Delimiter">)</span> size = p_memsz<span class="Delimiter">;</span>
-<span id="L91" class="LineNr"> 91 </span>  <a href='003trace.cc.html#L192'>dbg</a> &lt;&lt; <span class="Constant">&quot;blitting file offsets (&quot;</span> &lt;&lt; p_offset &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_offset+p_filesz<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;) to addresses (&quot;</span> &lt;&lt; p_vaddr &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_vaddr+p_memsz<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L91" class="LineNr"> 91 </span>  <a href='003trace.cc.html#L193'>dbg</a> &lt;&lt; <span class="Constant">&quot;blitting file offsets (&quot;</span> &lt;&lt; p_offset &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_offset+p_filesz<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;) to addresses (&quot;</span> &lt;&lt; p_vaddr &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_vaddr+p_memsz<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; p_filesz<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span>
 <span id="L93" class="LineNr"> 93 </span>    <a href='010vm.cc.html#L130'>write_mem_u8</a><span class="Delimiter">(</span>p_vaddr+i<span class="Delimiter">,</span> elf_contents[p_offset+i]<span class="Delimiter">);</span>
 <span id="L94" class="LineNr"> 94 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010vm.cc.html#L95'>End_of_program</a> &lt; p_vaddr+p_memsz<span class="Delimiter">)</span>
@@ -160,36 +160,36 @@ if ('onhashchange' in window) {
 <span id="L101" class="LineNr">101 </span><span class="Comment">//   data: 0x08049000 -&gt; 0x08049fff</span>
 <span id="L102" class="LineNr">102 </span><span class="Comment">//   heap: 0x0804a000 -&gt; 0x0804afff</span>
 <span id="L103" class="LineNr">103 </span><span class="Comment">//   stack: 0x0804bfff -&gt; 0x0804b000 (downward)</span>
-<span id="L104" class="LineNr">104 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='020elf.cc.html#L104'>CODE_START</a> = <span class="Constant">0x08048000</span><span class="Delimiter">;</span>
-<span id="L105" class="LineNr">105 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='020elf.cc.html#L105'>SEGMENT_SIZE</a> = <span class="Constant">0x1000</span><span class="Delimiter">;</span>
-<span id="L106" class="LineNr">106 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='020elf.cc.html#L106'>AFTER_STACK</a> = <span class="Constant">0x0804c000</span><span class="Delimiter">;</span>
+<span id="L104" class="LineNr">104 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L104'>CODE_START</a> = <span class="Constant">0x08048000</span><span class="Delimiter">;</span>
+<span id="L105" class="LineNr">105 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L105'>SEGMENT_SIZE</a> = <span class="Constant">0x1000</span><span class="Delimiter">;</span>
+<span id="L106" class="LineNr">106 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L106'>AFTER_STACK</a> = <span class="Constant">0x0804c000</span><span class="Delimiter">;</span>
 <span id="L107" class="LineNr">107 </span><span class="Delimiter">:(code)</span>
-<span id="L108" class="LineNr">108 </span><span class="Normal">void</span> <a href='020elf.cc.html#L108'>initialize_mem</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L109" class="LineNr">109 </span>  <a href='010vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><a href='020elf.cc.html#L106'>AFTER_STACK</a> - <a href='020elf.cc.html#L104'>CODE_START</a><span class="Delimiter">);</span>
+<span id="L108" class="LineNr">108 </span><span class="Normal">void</span> <a href='012elf.cc.html#L108'>initialize_mem</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L109" class="LineNr">109 </span>  <a href='010vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><a href='012elf.cc.html#L106'>AFTER_STACK</a> - <a href='012elf.cc.html#L104'>CODE_START</a><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">inline</span> <span class="Normal">uint32_t</span> <a href='020elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L112" class="LineNr">112 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span> <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L113" class="LineNr">113 </span>  <span class="Identifier">return</span> p[<span class="Constant">0</span>] | p[<span class="Constant">1</span>] &lt;&lt; <span class="Constant">8</span> | p[<span class="Constant">2</span>] &lt;&lt; <span class="Constant">16</span> | p[<span class="Constant">3</span>] &lt;&lt; <span class="Constant">24</span><span class="Delimiter">;</span>
 <span id="L114" class="LineNr">114 </span><span class="Delimiter">}</span>
 <span id="L115" class="LineNr">115 </span>
-<span id="L116" class="LineNr">116 </span><span class="Normal">inline</span> <span class="Normal">uint16_t</span> <a href='020elf.cc.html#L116'>u16_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L116" class="LineNr">116 </span><span class="Normal">inline</span> <span class="Normal">uint16_t</span> <a href='012elf.cc.html#L116'>u16_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L117" class="LineNr">117 </span>  <span class="Identifier">return</span> p[<span class="Constant">0</span>] | p[<span class="Constant">1</span>] &lt;&lt; <span class="Constant">8</span><span class="Delimiter">;</span>
 <span id="L118" class="LineNr">118 </span><span class="Delimiter">}</span>
 <span id="L119" class="LineNr">119 </span>
 <span id="L120" class="LineNr">120 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L121" class="LineNr">121 </span><span class="Normal">struct</span> <a href='020elf.cc.html#L121'>perr</a> <span class="Delimiter">{};</span>
+<span id="L121" class="LineNr">121 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L121'>perr</a> <span class="Delimiter">{};</span>
 <span id="L122" class="LineNr">122 </span><span class="Delimiter">:(code)</span>
-<span id="L123" class="LineNr">123 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> <a href='020elf.cc.html#L121'>perr</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L123" class="LineNr">123 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> <a href='012elf.cc.html#L121'>perr</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L124" class="LineNr">124 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>errno<span class="Delimiter">)</span>
 <span id="L125" class="LineNr">125 </span>    os &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">);</span>
 <span id="L126" class="LineNr">126 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
 <span id="L127" class="LineNr">127 </span><span class="Delimiter">}</span>
 <span id="L128" class="LineNr">128 </span>
 <span id="L129" class="LineNr">129 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L130" class="LineNr">130 </span><span class="Normal">struct</span> <a href='020elf.cc.html#L130'>die</a> <span class="Delimiter">{};</span>
+<span id="L130" class="LineNr">130 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L130'>die</a> <span class="Delimiter">{};</span>
 <span id="L131" class="LineNr">131 </span><span class="Delimiter">:(code)</span>
-<span id="L132" class="LineNr">132 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">,</span> <a href='020elf.cc.html#L130'>die</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L133" class="LineNr">133 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L182'>Trace_stream</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L182'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L155'>newline</a><span class="Delimiter">();</span>
+<span id="L132" class="LineNr">132 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">,</span> <a href='012elf.cc.html#L130'>die</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L133" class="LineNr">133 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L183'>Trace_stream</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L183'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L156'>newline</a><span class="Delimiter">();</span>
 <span id="L134" class="LineNr">134 </span>  exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L135" class="LineNr">135 </span><span class="Delimiter">}</span>
 <span id="L136" class="LineNr">136 </span>
@@ -199,6 +199,7 @@ if ('onhashchange' in window) {
 <span id="L140" class="LineNr">140 </span><span class="Comment">#include &lt;fcntl.h&gt;</span>
 <span id="L141" class="LineNr">141 </span><span class="Comment">#include &lt;stdarg.h&gt;</span>
 <span id="L142" class="LineNr">142 </span><span class="Comment">#include &lt;errno.h&gt;</span>
+<span id="L143" class="LineNr">143 </span><span class="Comment">#include &lt;unistd.h&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/012indirect_addressing.cc.html b/html/subx/012indirect_addressing.cc.html
deleted file mode 100644
index 4ae0e3cc..00000000
--- a/html/subx/012indirect_addressing.cc.html
+++ /dev/null
@@ -1,577 +0,0 @@
-<!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/012indirect_addressing.cc</title>
-<meta name="Generator" content="Vim/7.4">
-<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; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.traceAbsent { color: #c00000; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.traceContains { color: #008000; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
--->
-</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">//: operating on memory at the address provided by some register</span>
-<span id="L2" class="LineNr">  2 </span>
-<span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32)</span>
-<span id="L4" class="LineNr">  4 </span><span class="Special">% Reg[3].i = 0x10;</span>
-<span id="L5" class="LineNr">  5 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L6" class="LineNr">  6 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L8" class="LineNr">  8 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">18</span>                                     <span class="Comment"># add EBX to *EAX</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L10" class="LineNr"> 10 </span><span class="traceContains">+run: add <a href='010core.cc.html#L10'>EBX</a> to r/m32</span>
-<span id="L11" class="LineNr"> 11 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L12" class="LineNr"> 12 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L13" class="LineNr"> 13 </span>
-<span id="L14" class="LineNr"> 14 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
-<span id="L15" class="LineNr"> 15 </span><span class="Normal">case</span> <span class="Constant">0</span>:  <span class="Comment">// indirect addressing</span>
-<span id="L16" class="LineNr"> 16 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L17" class="LineNr"> 17 </span>  <span class="Normal">default</span>:  <span class="Comment">// address in register</span>
-<span id="L18" class="LineNr"> 18 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L19" class="LineNr"> 19 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L20" class="LineNr"> 20 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="Comment">// End Mod 0 Special-cases(addr)</span>
-<span id="L22" class="LineNr"> 22 </span>  <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 id="L25" class="LineNr"> 25 </span><span class="Comment">//:</span>
-<span id="L26" class="LineNr"> 26 </span>
-<span id="L27" class="LineNr"> 27 </span><span class="Delimiter">:(scenario add_mem_at_r32_to_r32)</span>
-<span id="L28" class="LineNr"> 28 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L29" class="LineNr"> 29 </span><span class="Special">% Reg[3].i = 0x10;</span>
-<span id="L30" class="LineNr"> 30 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="PreProc">0</span><span class="Constant">3</span>  <span class="Constant">18</span>                                      <span class="Comment"># add *EAX to EBX</span>
-<span id="L33" class="LineNr"> 33 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L34" class="LineNr"> 34 </span><span class="traceContains">+run: add r/m32 to <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L35" class="LineNr"> 35 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L36" class="LineNr"> 36 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L37" class="LineNr"> 37 </span>
-<span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L39" class="LineNr"> 39 </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="L40" class="LineNr"> 40 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L41" class="LineNr"> 41 </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="L42" class="LineNr"> 42 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L43" class="LineNr"> 43 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L44" class="LineNr"> 44 </span>  <a href='010core.cc.html#L43'>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="L45" class="LineNr"> 45 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L46" class="LineNr"> 46 </span><span class="Delimiter">}</span>
-<span id="L47" class="LineNr"> 47 </span>
-<span id="L48" class="LineNr"> 48 </span><span class="SalientComment">//:: subtract</span>
-<span id="L49" class="LineNr"> 49 </span>
-<span id="L50" class="LineNr"> 50 </span><span class="Delimiter">:(scenario subtract_r32_from_mem_at_r32)</span>
-<span id="L51" class="LineNr"> 51 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L52" class="LineNr"> 52 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 10);</span>
-<span id="L53" class="LineNr"> 53 </span><span class="Special">% Reg[3].i = 1;</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L55" class="LineNr"> 55 </span>  <span class="Constant">29</span>  <span class="Constant">18</span>                                      <span class="Comment"># subtract EBX from *EAX</span>
-<span id="L56" class="LineNr"> 56 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L57" class="LineNr"> 57 </span><span class="traceContains">+run: subtract <a href='010core.cc.html#L10'>EBX</a> from r/m32</span>
-<span id="L58" class="LineNr"> 58 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L59" class="LineNr"> 59 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L60" class="LineNr"> 60 </span>
-<span id="L61" class="LineNr"> 61 </span><span class="Comment">//:</span>
-<span id="L62" class="LineNr"> 62 </span>
-<span id="L63" class="LineNr"> 63 </span><span class="Delimiter">:(scenario subtract_mem_at_r32_from_r32)</span>
-<span id="L64" class="LineNr"> 64 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L65" class="LineNr"> 65 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L66" class="LineNr"> 66 </span><span class="Special">% Reg[3].i = 10;</span>
-<span id="L67" class="LineNr"> 67 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L68" class="LineNr"> 68 </span>  2b  <span class="Constant">18</span>                                      <span class="Comment"># subtract *EAX from EBX</span>
-<span id="L69" class="LineNr"> 69 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L70" class="LineNr"> 70 </span><span class="traceContains">+run: subtract r/m32 from <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L71" class="LineNr"> 71 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L72" class="LineNr"> 72 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L73" class="LineNr"> 73 </span>
-<span id="L74" class="LineNr"> 74 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L75" class="LineNr"> 75 </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="L76" class="LineNr"> 76 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L77" class="LineNr"> 77 </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="L78" class="LineNr"> 78 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L79" class="LineNr"> 79 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L80" class="LineNr"> 80 </span>  <a href='010core.cc.html#L43'>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="L81" class="LineNr"> 81 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L82" class="LineNr"> 82 </span><span class="Delimiter">}</span>
-<span id="L83" class="LineNr"> 83 </span>
-<span id="L84" class="LineNr"> 84 </span><span class="SalientComment">//:: and</span>
-<span id="L85" class="LineNr"> 85 </span>
-<span id="L86" class="LineNr"> 86 </span><span class="Delimiter">:(scenario and_r32_with_mem_at_r32)</span>
-<span id="L87" class="LineNr"> 87 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L88" class="LineNr"> 88 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c0d);</span>
-<span id="L89" class="LineNr"> 89 </span><span class="Special">% Reg[3].i = 0xff;</span>
-<span id="L90" class="LineNr"> 90 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L91" class="LineNr"> 91 </span>  <span class="Constant">21</span>  <span class="Constant">18</span>                                      <span class="Comment"># and EBX with *EAX</span>
-<span id="L92" class="LineNr"> 92 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L93" class="LineNr"> 93 </span><span class="traceContains">+run: and <a href='010core.cc.html#L10'>EBX</a> with r/m32</span>
-<span id="L94" class="LineNr"> 94 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L95" class="LineNr"> 95 </span><span class="traceContains">+run: storing 0x0000000d</span>
-<span id="L96" class="LineNr"> 96 </span>
-<span id="L97" class="LineNr"> 97 </span><span class="Comment">//:</span>
-<span id="L98" class="LineNr"> 98 </span>
-<span id="L99" class="LineNr"> 99 </span><span class="Delimiter">:(scenario and_mem_at_r32_with_r32)</span>
-<span id="L100" class="LineNr">100 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L101" class="LineNr">101 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x000000ff);</span>
-<span id="L102" class="LineNr">102 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
-<span id="L103" class="LineNr">103 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Constant">23</span>  <span class="Constant">18</span>                                      <span class="Comment"># and *EAX with EBX</span>
-<span id="L105" class="LineNr">105 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L106" class="LineNr">106 </span><span class="traceContains">+run: and r/m32 with <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L107" class="LineNr">107 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L108" class="LineNr">108 </span><span class="traceContains">+run: storing 0x0000000d</span>
-<span id="L109" class="LineNr">109 </span>
-<span id="L110" class="LineNr">110 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L111" class="LineNr">111 </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="L112" class="LineNr">112 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L113" class="LineNr">113 </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="L114" class="LineNr">114 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L115" class="LineNr">115 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L116" class="LineNr">116 </span>  <a href='010core.cc.html#L55'>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="L117" class="LineNr">117 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L118" class="LineNr">118 </span><span class="Delimiter">}</span>
-<span id="L119" class="LineNr">119 </span>
-<span id="L120" class="LineNr">120 </span><span class="SalientComment">//:: or</span>
-<span id="L121" class="LineNr">121 </span>
-<span id="L122" class="LineNr">122 </span><span class="Delimiter">:(scenario or_r32_with_mem_at_r32)</span>
-<span id="L123" class="LineNr">123 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L124" class="LineNr">124 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c0d);</span>
-<span id="L125" class="LineNr">125 </span><span class="Special">% Reg[3].i = 0xa0b0c0d0;</span>
-<span id="L126" class="LineNr">126 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L127" class="LineNr">127 </span>  <span class="Error">09</span>  <span class="Constant">18</span>                                      <span class="Comment"># or EBX with *EAX</span>
-<span id="L128" class="LineNr">128 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L129" class="LineNr">129 </span><span class="traceContains">+run: or <a href='010core.cc.html#L10'>EBX</a> with r/m32</span>
-<span id="L130" class="LineNr">130 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L131" class="LineNr">131 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
-<span id="L132" class="LineNr">132 </span>
-<span id="L133" class="LineNr">133 </span><span class="Comment">//:</span>
-<span id="L134" class="LineNr">134 </span>
-<span id="L135" class="LineNr">135 </span><span class="Delimiter">:(scenario or_mem_at_r32_with_r32)</span>
-<span id="L136" class="LineNr">136 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L137" class="LineNr">137 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c0d);</span>
-<span id="L138" class="LineNr">138 </span><span class="Special">% Reg[3].i = 0xa0b0c0d0;</span>
-<span id="L139" class="LineNr">139 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L140" class="LineNr">140 </span>  0b  <span class="Constant">18</span>                                      <span class="Comment"># or *EAX with EBX</span>
-<span id="L141" class="LineNr">141 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L142" class="LineNr">142 </span><span class="traceContains">+run: or r/m32 with <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L143" class="LineNr">143 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L144" class="LineNr">144 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
-<span id="L145" class="LineNr">145 </span>
-<span id="L146" class="LineNr">146 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L147" class="LineNr">147 </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="L148" class="LineNr">148 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L149" class="LineNr">149 </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="L150" class="LineNr">150 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L151" class="LineNr">151 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L152" class="LineNr">152 </span>  <a href='010core.cc.html#L55'>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="L153" class="LineNr">153 </span>  <span class="Identifier">break</span><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><span class="SalientComment">//:: xor</span>
-<span id="L157" class="LineNr">157 </span>
-<span id="L158" class="LineNr">158 </span><span class="Delimiter">:(scenario xor_r32_with_mem_at_r32)</span>
-<span id="L159" class="LineNr">159 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L160" class="LineNr">160 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0xaabb0c0d);</span>
-<span id="L161" class="LineNr">161 </span><span class="Special">% Reg[3].i = 0xa0b0c0d0;</span>
-<span id="L162" class="LineNr">162 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L163" class="LineNr">163 </span>  <span class="Constant">31</span>  <span class="Constant">18</span>                                      <span class="Comment"># xor EBX with *EAX</span>
-<span id="L164" class="LineNr">164 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L165" class="LineNr">165 </span><span class="traceContains">+run: xor <a href='010core.cc.html#L10'>EBX</a> with r/m32</span>
-<span id="L166" class="LineNr">166 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L167" class="LineNr">167 </span><span class="traceContains">+run: storing 0x0a0bccdd</span>
-<span id="L168" class="LineNr">168 </span>
-<span id="L169" class="LineNr">169 </span><span class="Comment">//:</span>
-<span id="L170" class="LineNr">170 </span>
-<span id="L171" class="LineNr">171 </span><span class="Delimiter">:(scenario xor_mem_at_r32_with_r32)</span>
-<span id="L172" class="LineNr">172 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L173" class="LineNr">173 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c0d);</span>
-<span id="L174" class="LineNr">174 </span><span class="Special">% Reg[3].i = 0xa0b0c0d0;</span>
-<span id="L175" class="LineNr">175 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L176" class="LineNr">176 </span>  <span class="Constant">33</span>  <span class="Constant">18</span>                                      <span class="Comment"># xor *EAX with EBX</span>
-<span id="L177" class="LineNr">177 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L178" class="LineNr">178 </span><span class="traceContains">+run: xor r/m32 with <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L179" class="LineNr">179 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L180" class="LineNr">180 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
-<span id="L181" class="LineNr">181 </span>
-<span id="L182" class="LineNr">182 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L183" class="LineNr">183 </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="L184" class="LineNr">184 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L185" class="LineNr">185 </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="L186" class="LineNr">186 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L187" class="LineNr">187 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L188" class="LineNr">188 </span>  <a href='010core.cc.html#L55'>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="L189" class="LineNr">189 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L190" class="LineNr">190 </span><span class="Delimiter">}</span>
-<span id="L191" class="LineNr">191 </span>
-<span id="L192" class="LineNr">192 </span><span class="SalientComment">//:: not</span>
-<span id="L193" class="LineNr">193 </span>
-<span id="L194" class="LineNr">194 </span><span class="Delimiter">:(scenario not_r32_with_mem_at_r32)</span>
-<span id="L195" class="LineNr">195 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L196" class="LineNr">196 </span><span class="Comment"># word at 0x60 is 0x0f0f00ff</span>
-<span id="L197" class="LineNr">197 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0f0f00ff);</span>
-<span id="L198" class="LineNr">198 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L199" class="LineNr">199 </span>  f7  <span class="PreProc">0</span><span class="Constant">3</span>                                      <span class="Comment"># negate *EBX</span>
-<span id="L200" class="LineNr">200 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (unused) 011 (dest EBX)</span>
-<span id="L201" class="LineNr">201 </span><span class="traceContains">+run: 'not' of r/m32</span>
-<span id="L202" class="LineNr">202 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L203" class="LineNr">203 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
-<span id="L204" class="LineNr">204 </span>
-<span id="L205" class="LineNr">205 </span><span class="SalientComment">//:: compare (cmp)</span>
-<span id="L206" class="LineNr">206 </span>
-<span id="L207" class="LineNr">207 </span><span class="Delimiter">:(scenario compare_mem_at_r32_with_r32_greater)</span>
-<span id="L208" class="LineNr">208 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L209" class="LineNr">209 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c0d);</span>
-<span id="L210" class="LineNr">210 </span><span class="Special">% Reg[3].i = 0x0a0b0c07;</span>
-<span id="L211" class="LineNr">211 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L212" class="LineNr">212 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX with *EAX</span>
-<span id="L213" class="LineNr">213 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L214" class="LineNr">214 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L10'>EBX</a> with r/m32</span>
-<span id="L215" class="LineNr">215 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L216" class="LineNr">216 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L217" class="LineNr">217 </span>
-<span id="L218" class="LineNr">218 </span><span class="Delimiter">:(scenario compare_mem_at_r32_with_r32_lesser)</span>
-<span id="L219" class="LineNr">219 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L220" class="LineNr">220 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c07);</span>
-<span id="L221" class="LineNr">221 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
-<span id="L222" class="LineNr">222 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L223" class="LineNr">223 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX with *EAX</span>
-<span id="L224" class="LineNr">224 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L225" class="LineNr">225 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L10'>EBX</a> with r/m32</span>
-<span id="L226" class="LineNr">226 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L227" class="LineNr">227 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L228" class="LineNr">228 </span>
-<span id="L229" class="LineNr">229 </span><span class="Delimiter">:(scenario compare_mem_at_r32_with_r32_equal)</span>
-<span id="L230" class="LineNr">230 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L231" class="LineNr">231 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c0d);</span>
-<span id="L232" class="LineNr">232 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
-<span id="L233" class="LineNr">233 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L234" class="LineNr">234 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX with *EAX</span>
-<span id="L235" class="LineNr">235 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L236" class="LineNr">236 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L10'>EBX</a> with r/m32</span>
-<span id="L237" class="LineNr">237 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L238" class="LineNr">238 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L239" class="LineNr">239 </span>
-<span id="L240" class="LineNr">240 </span><span class="Comment">//:</span>
-<span id="L241" class="LineNr">241 </span>
-<span id="L242" class="LineNr">242 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_greater)</span>
-<span id="L243" class="LineNr">243 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L244" class="LineNr">244 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c07);</span>
-<span id="L245" class="LineNr">245 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
-<span id="L246" class="LineNr">246 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L247" class="LineNr">247 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX with EBX</span>
-<span id="L248" class="LineNr">248 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L249" class="LineNr">249 </span><span class="traceContains">+run: compare r/m32 with <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L250" class="LineNr">250 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L251" class="LineNr">251 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L252" class="LineNr">252 </span>
-<span id="L253" class="LineNr">253 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L254" class="LineNr">254 </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="L255" class="LineNr">255 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L256" class="LineNr">256 </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="L257" class="LineNr">257 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L258" class="LineNr">258 </span>  <span class="Normal">int32_t</span> arg1 = Reg[reg1]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L259" class="LineNr">259 </span>  <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L260" class="LineNr">260 </span>  <span class="Normal">int32_t</span> tmp1 = arg1 - *arg2<span class="Delimiter">;</span>
-<span id="L261" class="LineNr">261 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L262" class="LineNr">262 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L263" class="LineNr">263 </span>  <span class="Normal">int64_t</span> tmp2 = arg1 - *arg2<span class="Delimiter">;</span>
-<span id="L264" class="LineNr">264 </span>  <a href='010core.cc.html#L33'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L265" class="LineNr">265 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L33'>OF</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L266" class="LineNr">266 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L267" class="LineNr">267 </span><span class="Delimiter">}</span>
-<span id="L268" class="LineNr">268 </span>
-<span id="L269" class="LineNr">269 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_lesser)</span>
-<span id="L270" class="LineNr">270 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L271" class="LineNr">271 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c0d);</span>
-<span id="L272" class="LineNr">272 </span><span class="Special">% Reg[3].i = 0x0a0b0c07;</span>
-<span id="L273" class="LineNr">273 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L274" class="LineNr">274 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX with EBX</span>
-<span id="L275" class="LineNr">275 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L276" class="LineNr">276 </span><span class="traceContains">+run: compare r/m32 with <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L277" class="LineNr">277 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L278" class="LineNr">278 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L279" class="LineNr">279 </span>
-<span id="L280" class="LineNr">280 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_equal)</span>
-<span id="L281" class="LineNr">281 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L282" class="LineNr">282 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c0d);</span>
-<span id="L283" class="LineNr">283 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
-<span id="L284" class="LineNr">284 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L285" class="LineNr">285 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX with EBX</span>
-<span id="L286" class="LineNr">286 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L287" class="LineNr">287 </span><span class="traceContains">+run: compare r/m32 with <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L288" class="LineNr">288 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L289" class="LineNr">289 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L290" class="LineNr">290 </span>
-<span id="L291" class="LineNr">291 </span><span class="SalientComment">//:: copy (mov)</span>
-<span id="L292" class="LineNr">292 </span>
-<span id="L293" class="LineNr">293 </span><span class="Delimiter">:(scenario copy_r32_to_mem_at_r32)</span>
-<span id="L294" class="LineNr">294 </span><span class="Special">% Reg[3].i = 0xaf;</span>
-<span id="L295" class="LineNr">295 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L296" class="LineNr">296 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L297" class="LineNr">297 </span>  <span class="Constant">89</span>  <span class="Constant">18</span>                                      <span class="Comment"># copy EBX to *EAX</span>
-<span id="L298" class="LineNr">298 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L299" class="LineNr">299 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L10'>EBX</a> to r/m32</span>
-<span id="L300" class="LineNr">300 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L301" class="LineNr">301 </span><span class="traceContains">+run: storing 0x000000af</span>
-<span id="L302" class="LineNr">302 </span>
-<span id="L303" class="LineNr">303 </span><span class="Comment">//:</span>
-<span id="L304" class="LineNr">304 </span>
-<span id="L305" class="LineNr">305 </span><span class="Delimiter">:(scenario copy_mem_at_r32_to_r32)</span>
-<span id="L306" class="LineNr">306 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L307" class="LineNr">307 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x000000af);</span>
-<span id="L308" class="LineNr">308 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L309" class="LineNr">309 </span>  8b  <span class="Constant">18</span>                                      <span class="Comment"># copy *EAX to EBX</span>
-<span id="L310" class="LineNr">310 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L311" class="LineNr">311 </span><span class="traceContains">+run: copy r/m32 to <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L312" class="LineNr">312 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L313" class="LineNr">313 </span><span class="traceContains">+run: storing 0x000000af</span>
-<span id="L314" class="LineNr">314 </span>
-<span id="L315" class="LineNr">315 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L316" class="LineNr">316 </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="L317" class="LineNr">317 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L318" class="LineNr">318 </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="L319" class="LineNr">319 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L320" class="LineNr">320 </span>  <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L321" class="LineNr">321 </span>  Reg[reg1]<span class="Delimiter">.</span>i = *arg2<span class="Delimiter">;</span>
-<span id="L322" class="LineNr">322 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; *arg2 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L323" class="LineNr">323 </span>  <span class="Identifier">break</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="SalientComment">//:: jump</span>
-<span id="L327" class="LineNr">327 </span>
-<span id="L328" class="LineNr">328 </span><span class="Delimiter">:(scenario jump_mem_at_r32)</span>
-<span id="L329" class="LineNr">329 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L330" class="LineNr">330 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 8);</span>
-<span id="L331" class="LineNr">331 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L332" class="LineNr">332 </span>  ff  <span class="Constant">20</span>                                      <span class="Comment"># jump to *EAX</span>
-<span id="L333" class="LineNr">333 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 100 (jump to r/m32) 000 (src EAX)</span>
-<span id="L334" class="LineNr">334 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L335" class="LineNr">335 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L336" class="LineNr">336 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L337" class="LineNr">337 </span><span class="traceContains">+run: jump to r/m32</span>
-<span id="L338" class="LineNr">338 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L339" class="LineNr">339 </span><span class="traceContains">+run: jumping to 0x00000008</span>
-<span id="L340" class="LineNr">340 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L341" class="LineNr">341 </span><span class="traceAbsent">-run: inst: 0x00000003</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">0xff</span>: <span class="Delimiter">{</span>
-<span id="L345" class="LineNr">345 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L346" class="LineNr">346 </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="L347" class="LineNr">347 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L348" class="LineNr">348 </span>    <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump to r/m32</span>
-<span id="L349" class="LineNr">349 </span>      <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L350" class="LineNr">350 </span>      <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L351" class="LineNr">351 </span>      <a href='010core.cc.html#L23'>EIP</a> = *arg2<span class="Delimiter">;</span>
-<span id="L352" class="LineNr">352 </span>      <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; <a href='010core.cc.html#L23'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L353" class="LineNr">353 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L354" class="LineNr">354 </span>    <span class="Delimiter">}</span>
-<span id="L355" class="LineNr">355 </span>    <span class="Comment">// End Op ff Subops</span>
-<span id="L356" class="LineNr">356 </span>  <span class="Delimiter">}</span>
-<span id="L357" class="LineNr">357 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L358" class="LineNr">358 </span><span class="Delimiter">}</span>
-<span id="L359" class="LineNr">359 </span>
-<span id="L360" class="LineNr">360 </span><span class="SalientComment">//:: push</span>
-<span id="L361" class="LineNr">361 </span>
-<span id="L362" class="LineNr">362 </span><span class="Delimiter">:(scenario push_mem_at_r32)</span>
-<span id="L363" class="LineNr">363 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L364" class="LineNr">364 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x000000af);</span>
-<span id="L365" class="LineNr">365 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
-<span id="L366" class="LineNr">366 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L367" class="LineNr">367 </span>  ff  <span class="Constant">30</span>                                      <span class="Comment"># push *EAX to stack</span>
-<span id="L368" class="LineNr">368 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (push r/m32) 000 (src EAX)</span>
-<span id="L369" class="LineNr">369 </span><span class="traceContains">+run: <a href='011direct_addressing.cc.html#L283'>push</a> r/m32</span>
-<span id="L370" class="LineNr">370 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L371" class="LineNr">371 </span><span class="traceContains">+run: decrementing <a href='010core.cc.html#L11'>ESP</a> to 0x00000010</span>
-<span id="L372" class="LineNr">372 </span><span class="traceContains">+run: pushing value 0x000000af</span>
-<span id="L373" class="LineNr">373 </span>
-<span id="L374" class="LineNr">374 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
-<span id="L375" class="LineNr">375 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>  <span class="Comment">// push r/m32 to stack</span>
-<span id="L376" class="LineNr">376 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L377" class="LineNr">377 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* val = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L378" class="LineNr">378 </span>  <a href='011direct_addressing.cc.html#L283'>push</a><span class="Delimiter">(</span>*val<span class="Delimiter">);</span>
-<span id="L379" class="LineNr">379 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L380" class="LineNr">380 </span><span class="Delimiter">}</span>
-<span id="L381" class="LineNr">381 </span>
-<span id="L382" class="LineNr">382 </span><span class="SalientComment">//:: pop</span>
-<span id="L383" class="LineNr">383 </span>
-<span id="L384" class="LineNr">384 </span><span class="Delimiter">:(scenario pop_mem_at_r32)</span>
-<span id="L385" class="LineNr">385 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L386" class="LineNr">386 </span><span class="Special">% Reg[ESP].u = 0x10;</span>
-<span id="L387" class="LineNr">387 </span><span class="Special">% SET_WORD_IN_MEM(0x10, 0x00000030);</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">8f</span>  <span class="PreProc">0</span><span class="Constant">0</span>                                      <span class="Comment"># pop stack into *EAX</span>
-<span id="L390" class="LineNr">390 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (pop r/m32) 000 (dest EAX)</span>
-<span id="L391" class="LineNr">391 </span><span class="traceContains">+run: <a href='011direct_addressing.cc.html#L316'>pop</a> into r/m32</span>
-<span id="L392" class="LineNr">392 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L393" class="LineNr">393 </span><span class="traceContains">+run: popping value 0x00000030</span>
-<span id="L394" class="LineNr">394 </span><span class="traceContains">+run: incrementing <a href='010core.cc.html#L11'>ESP</a> to 0x00000014</span>
-<span id="L395" class="LineNr">395 </span>
-<span id="L396" class="LineNr">396 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L397" class="LineNr">397 </span><span class="Normal">case</span> <span class="Constant">0x8f</span>: <span class="Delimiter">{</span>  <span class="Comment">// pop stack into r/m32</span>
-<span id="L398" class="LineNr">398 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L399" class="LineNr">399 </span>  <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L400" class="LineNr">400 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L401" class="LineNr">401 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>
-<span id="L402" class="LineNr">402 </span>      <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L403" class="LineNr">403 </span>      <span class="Normal">int32_t</span>* dest = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L404" class="LineNr">404 </span>      *dest = <a href='011direct_addressing.cc.html#L316'>pop</a><span class="Delimiter">();</span>
-<span id="L405" class="LineNr">405 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L406" class="LineNr">406 </span>    <span class="Delimiter">}</span>
-<span id="L407" class="LineNr">407 </span>  <span class="Delimiter">}</span>
-<span id="L408" class="LineNr">408 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L409" class="LineNr">409 </span><span class="Delimiter">}</span>
-<span id="L410" class="LineNr">410 </span>
-<span id="L411" class="LineNr">411 </span><span class="SalientComment">//:: special-case for loading address from disp32 rather than register</span>
-<span id="L412" class="LineNr">412 </span>
-<span id="L413" class="LineNr">413 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_displacement)</span>
-<span id="L414" class="LineNr">414 </span><span class="Special">% Reg[3].i = 0x10;  // source</span>
-<span id="L415" class="LineNr">415 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L416" class="LineNr">416 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L417" class="LineNr">417 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  1d            <span class="Constant">60</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>              <span class="Comment"># add EBX to *0x60</span>
-<span id="L418" class="LineNr">418 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 101 (dest in disp32)</span>
-<span id="L419" class="LineNr">419 </span><span class="traceContains">+run: add <a href='010core.cc.html#L10'>EBX</a> to r/m32</span>
-<span id="L420" class="LineNr">420 </span><span class="traceContains">+run: effective address is 0x60 (disp32)</span>
-<span id="L421" class="LineNr">421 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L422" class="LineNr">422 </span>
-<span id="L423" class="LineNr">423 </span><span class="Delimiter">:(before &quot;End Mod 0 Special-cases(addr)&quot;)</span>
-<span id="L424" class="LineNr">424 </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="L425" class="LineNr">425 </span>  addr = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L426" class="LineNr">426 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L427" class="LineNr">427 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L428" class="LineNr">428 </span>
-<span id="L429" class="LineNr">429 </span><span class="Comment">//:</span>
-<span id="L430" class="LineNr">430 </span>
-<span id="L431" class="LineNr">431 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_disp8)</span>
-<span id="L432" class="LineNr">432 </span><span class="Special">% Reg[3].i = 0x10;  // source</span>
-<span id="L433" class="LineNr">433 </span><span class="Special">% Reg[0].i = 0x5e;  // dest</span>
-<span id="L434" class="LineNr">434 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L435" class="LineNr">435 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L436" class="LineNr">436 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">58</span>            <span class="PreProc">0</span><span class="Constant">2</span>                       <span class="Comment"># add EBX to *(EAX+2)</span>
-<span id="L437" class="LineNr">437 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L438" class="LineNr">438 </span><span class="traceContains">+run: add <a href='010core.cc.html#L10'>EBX</a> to r/m32</span>
-<span id="L439" class="LineNr">439 </span><span class="traceContains">+run: effective address is initially 0x5e (EAX)</span>
-<span id="L440" class="LineNr">440 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp8)</span>
-<span id="L441" class="LineNr">441 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L442" class="LineNr">442 </span>
-<span id="L443" class="LineNr">443 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
-<span id="L444" class="LineNr">444 </span><span class="Normal">case</span> <span class="Constant">1</span>:  <span class="Comment">// indirect + disp8 addressing</span>
-<span id="L445" class="LineNr">445 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L446" class="LineNr">446 </span>  <span class="Normal">default</span>:
-<span id="L447" class="LineNr">447 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L448" class="LineNr">448 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L449" class="LineNr">449 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L450" class="LineNr">450 </span>  <span class="Comment">// End Mod 1 Special-cases(addr)</span>
-<span id="L451" class="LineNr">451 </span>  <span class="Delimiter">}</span>
-<span id="L452" class="LineNr">452 </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="L453" class="LineNr">453 </span>    addr += <span class="Normal">static_cast</span>&lt;<span class="Normal">int8_t</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">());</span>
-<span id="L454" class="LineNr">454 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp8)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L455" class="LineNr">455 </span>  <span class="Delimiter">}</span>
-<span id="L456" class="LineNr">456 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L457" class="LineNr">457 </span>
-<span id="L458" class="LineNr">458 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_negative_disp8)</span>
-<span id="L459" class="LineNr">459 </span><span class="Special">% Reg[3].i = 0x10;  // source</span>
-<span id="L460" class="LineNr">460 </span><span class="Special">% Reg[0].i = 0x61;  // dest</span>
-<span id="L461" class="LineNr">461 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L462" class="LineNr">462 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L463" class="LineNr">463 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">58</span>            ff                       <span class="Comment"># add EBX to *(EAX-1)</span>
-<span id="L464" class="LineNr">464 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L465" class="LineNr">465 </span><span class="traceContains">+run: add <a href='010core.cc.html#L10'>EBX</a> to r/m32</span>
-<span id="L466" class="LineNr">466 </span><span class="traceContains">+run: effective address is initially 0x61 (EAX)</span>
-<span id="L467" class="LineNr">467 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp8)</span>
-<span id="L468" class="LineNr">468 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L469" class="LineNr">469 </span>
-<span id="L470" class="LineNr">470 </span><span class="Comment">//:</span>
-<span id="L471" class="LineNr">471 </span>
-<span id="L472" class="LineNr">472 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_disp32)</span>
-<span id="L473" class="LineNr">473 </span><span class="Special">% Reg[3].i = 0x10;  // source</span>
-<span id="L474" class="LineNr">474 </span><span class="Special">% Reg[0].i = 0x5e;  // dest</span>
-<span id="L475" class="LineNr">475 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L476" class="LineNr">476 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L477" class="LineNr">477 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">98</span>            <span class="PreProc">0</span><span class="Constant">2</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>              <span class="Comment"># add EBX to *(EAX+2)</span>
-<span id="L478" class="LineNr">478 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L479" class="LineNr">479 </span><span class="traceContains">+run: add <a href='010core.cc.html#L10'>EBX</a> to r/m32</span>
-<span id="L480" class="LineNr">480 </span><span class="traceContains">+run: effective address is initially 0x5e (EAX)</span>
-<span id="L481" class="LineNr">481 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp32)</span>
-<span id="L482" class="LineNr">482 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L483" class="LineNr">483 </span>
-<span id="L484" class="LineNr">484 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
-<span id="L485" class="LineNr">485 </span><span class="Normal">case</span> <span class="Constant">2</span>:  <span class="Comment">// indirect + disp32 addressing</span>
-<span id="L486" class="LineNr">486 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L487" class="LineNr">487 </span>  <span class="Normal">default</span>:
-<span id="L488" class="LineNr">488 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L489" class="LineNr">489 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L490" class="LineNr">490 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L491" class="LineNr">491 </span>  <span class="Comment">// End Mod 2 Special-cases(addr)</span>
-<span id="L492" class="LineNr">492 </span>  <span class="Delimiter">}</span>
-<span id="L493" class="LineNr">493 </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="L494" class="LineNr">494 </span>    addr += <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L495" class="LineNr">495 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L496" class="LineNr">496 </span>  <span class="Delimiter">}</span>
-<span id="L497" class="LineNr">497 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L498" class="LineNr">498 </span>
-<span id="L499" class="LineNr">499 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_negative_disp32)</span>
-<span id="L500" class="LineNr">500 </span><span class="Special">% Reg[3].i = 0x10;  // source</span>
-<span id="L501" class="LineNr">501 </span><span class="Special">% Reg[0].i = 0x61;  // dest</span>
-<span id="L502" class="LineNr">502 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L503" class="LineNr">503 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L504" class="LineNr">504 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">98</span>            ff ff ff ff              <span class="Comment"># add EBX to *(EAX-1)</span>
-<span id="L505" class="LineNr">505 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L506" class="LineNr">506 </span><span class="traceContains">+run: add <a href='010core.cc.html#L10'>EBX</a> to r/m32</span>
-<span id="L507" class="LineNr">507 </span><span class="traceContains">+run: effective address is initially 0x61 (EAX)</span>
-<span id="L508" class="LineNr">508 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp32)</span>
-<span id="L509" class="LineNr">509 </span><span class="traceContains">+run: storing 0x00000011</span>
-</pre>
-</body>
-</html>
-<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/012direct_addressing.cc.html b/html/subx/013direct_addressing.cc.html
index 2ec9add6..b7c416dd 100644
--- a/html/subx/012direct_addressing.cc.html
+++ b/html/subx/013direct_addressing.cc.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/012direct_addressing.cc</title>
+<title>Mu - subx/013direct_addressing.cc</title>
 <meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
@@ -15,19 +15,20 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.CommentedCode { color: #6c6c6c; }
 .LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
+.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
+.Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
 .traceContains { color: #008000; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
 .cSpecial { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
+.Identifier { color: #c0a020; }
+.PreProc { color: #800080; }
 -->
 </style>
 
@@ -65,7 +66,7 @@ if ('onhashchange' in window) {
 <span id="L1" class="LineNr">  1 </span><span class="Comment">//: operating directly on a register</span>
 <span id="L2" class="LineNr">  2 </span>
 <span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;01&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add r32 to rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;01&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add r32 to rm32&quot;</span><span class="Delimiter">);</span>
 <span id="L5" class="LineNr">  5 </span>
 <span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(scenario add_r32_to_r32)</span>
 <span id="L7" class="LineNr">  7 </span><span class="Special">% Reg[EAX].i = 0x10;</span>
@@ -80,10 +81,10 @@ 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">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='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L19" class="LineNr"> 19 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>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#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>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='010vm.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>
 <span id="L25" class="LineNr"> 25 </span><span class="Delimiter">}</span>
@@ -92,7 +93,7 @@ if ('onhashchange' in window) {
 <span id="L28" class="LineNr"> 28 </span><span class="Comment">// Implement tables 2-2 and 2-3 in the Intel manual, Volume 2.</span>
 <span id="L29" class="LineNr"> 29 </span><span class="Comment">// We return a pointer so that instructions can write to multiple bytes in</span>
 <span id="L30" class="LineNr"> 30 </span><span class="Comment">// 'Mem' at once.</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Normal">int32_t</span>* <a href='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L31" class="LineNr"> 31 </span><span class="Normal">int32_t</span>* <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <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>
@@ -100,18 +101,18 @@ if ('onhashchange' in window) {
 <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#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>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='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>mod<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L43" class="LineNr"> 43 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized mod bits: &quot;</span> &lt;&lt; <a href='010vm.cc.html#L241'>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='010vm.cc.html#L126'>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='012direct_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="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>
@@ -121,14 +122,14 @@ if ('onhashchange' in window) {
 <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#L196'>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#L213'>end</a><span class="Delimiter">();</span>  <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L60" class="LineNr"> 60 </span>  <span class="Normal">default</span>: <a href='003trace.cc.html#L197'>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#L215'>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='010vm.cc.html#L196'>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="L67" class="LineNr"> 67 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>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>
@@ -143,321 +144,350 @@ if ('onhashchange' in window) {
 <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='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>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#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L84" class="LineNr"> 84 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>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='010vm.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">//:: and</span>
+<span id="L90" class="LineNr"> 90 </span><span class="SalientComment">//:: multiply</span>
 <span id="L91" class="LineNr"> 91 </span>
 <span id="L92" class="LineNr"> 92 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L93" class="LineNr"> 93 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L93" class="LineNr"> 93 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L208'>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="L94" class="LineNr"> 94 </span>
-<span id="L95" class="LineNr"> 95 </span><span class="Delimiter">:(scenario and_r32_with_r32)</span>
-<span id="L96" class="LineNr"> 96 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L97" class="LineNr"> 97 </span><span class="Special">% Reg[EBX].i = 0x000000ff;</span>
+<span id="L95" class="LineNr"> 95 </span><span class="Delimiter">:(scenario multiply_r32_into_r32)</span>
+<span id="L96" class="LineNr"> 96 </span><span class="Special">% Reg[EAX].i = 4;</span>
+<span id="L97" class="LineNr"> 97 </span><span class="Special">% Reg[EBX].i = 2;</span>
 <span id="L98" class="LineNr"> 98 </span>== <span class="Constant">0x1</span>
-<span id="L99" class="LineNr"> 99 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Constant">21</span>  d8                                      <span class="Comment"># and EBX with destination EAX</span>
+<span id="L99" class="LineNr"> 99 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
+<span id="L100" class="LineNr">100 </span>  <span class="Constant">0f</span> af   d8                                      <span class="Comment"># subtract EBX into EAX</span>
 <span id="L101" class="LineNr">101 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L102" class="LineNr">102 </span><span class="traceContains">+run: and <a href='010vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L102" class="LineNr">102 </span><span class="traceContains">+run: multiply r/m32 into <a href='010vm.cc.html#L16'>EBX</a></span>
 <span id="L103" class="LineNr">103 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L13'>EAX</a></span>
-<span id="L104" class="LineNr">104 </span><span class="traceContains">+run: storing 0x0000000d</span>
+<span id="L104" class="LineNr">104 </span><span class="traceContains">+run: storing 0x00000008</span>
 <span id="L105" class="LineNr">105 </span>
-<span id="L106" class="LineNr">106 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L107" class="LineNr">107 </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="L108" class="LineNr">108 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L106" class="LineNr">106 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
+<span id="L107" class="LineNr">107 </span><span class="Normal">case</span> <span class="Constant">0xaf</span>: <span class="Delimiter">{</span>  <span class="Comment">// multiply r32 into r/m32</span>
+<span id="L108" class="LineNr">108 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L110" class="LineNr">110 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L111" class="LineNr">111 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L112" class="LineNr">112 </span>  <a href='010vm.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="L110" class="LineNr">110 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L111" class="LineNr">111 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L112" class="LineNr">112 </span>  <a href='010vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>*<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg1<span class="Delimiter">);</span>
 <span id="L113" class="LineNr">113 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L114" class="LineNr">114 </span><span class="Delimiter">}</span>
 <span id="L115" class="LineNr">115 </span>
-<span id="L116" class="LineNr">116 </span><span class="SalientComment">//:: or</span>
+<span id="L116" class="LineNr">116 </span><span class="SalientComment">//:: and</span>
 <span id="L117" class="LineNr">117 </span>
 <span id="L118" class="LineNr">118 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L119" class="LineNr">119 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L119" class="LineNr">119 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise AND of r32 with rm32&quot;</span><span class="Delimiter">);</span>
 <span id="L120" class="LineNr">120 </span>
-<span id="L121" class="LineNr">121 </span><span class="Delimiter">:(scenario or_r32_with_r32)</span>
+<span id="L121" class="LineNr">121 </span><span class="Delimiter">:(scenario and_r32_with_r32)</span>
 <span id="L122" class="LineNr">122 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L123" class="LineNr">123 </span><span class="Special">% Reg[EBX].i = 0xa0b0c0d0;</span>
+<span id="L123" class="LineNr">123 </span><span class="Special">% Reg[EBX].i = 0x000000ff;</span>
 <span id="L124" class="LineNr">124 </span>== <span class="Constant">0x1</span>
 <span id="L125" class="LineNr">125 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L126" class="LineNr">126 </span>  <span class="Error">09</span>  d8                                      <span class="Comment"># or EBX with destination EAX</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Constant">21</span>  d8                                      <span class="Comment"># and EBX with destination EAX</span>
 <span id="L127" class="LineNr">127 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L128" class="LineNr">128 </span><span class="traceContains">+run: or <a href='010vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L128" class="LineNr">128 </span><span class="traceContains">+run: and <a href='010vm.cc.html#L16'>EBX</a> with r/m32</span>
 <span id="L129" class="LineNr">129 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L13'>EAX</a></span>
-<span id="L130" class="LineNr">130 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
+<span id="L130" class="LineNr">130 </span><span class="traceContains">+run: storing 0x0000000d</span>
 <span id="L131" class="LineNr">131 </span>
 <span id="L132" class="LineNr">132 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L133" class="LineNr">133 </span><span class="Normal">case</span> <span class="Constant">0x09</span>: <span class="Delimiter">{</span>  <span class="Comment">// or r32 with r/m32</span>
-<span id="L134" class="LineNr">134 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L133" class="LineNr">133 </span><span class="Normal">case</span> <span class="Constant">0x21</span>: <span class="Delimiter">{</span>  <span class="Comment">// and r32 with r/m32</span>
+<span id="L134" class="LineNr">134 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
 <span id="L135" class="LineNr">135 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L136" class="LineNr">136 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L137" class="LineNr">137 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='012direct_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='010vm.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="L136" class="LineNr">136 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L138" class="LineNr">138 </span>  <a href='010vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L139" class="LineNr">139 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L140" class="LineNr">140 </span><span class="Delimiter">}</span>
 <span id="L141" class="LineNr">141 </span>
-<span id="L142" class="LineNr">142 </span><span class="SalientComment">//:: xor</span>
+<span id="L142" class="LineNr">142 </span><span class="SalientComment">//:: or</span>
 <span id="L143" class="LineNr">143 </span>
 <span id="L144" class="LineNr">144 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L145" class="LineNr">145 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L145" class="LineNr">145 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>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="L146" class="LineNr">146 </span>
-<span id="L147" class="LineNr">147 </span><span class="Delimiter">:(scenario xor_r32_with_r32)</span>
+<span id="L147" class="LineNr">147 </span><span class="Delimiter">:(scenario or_r32_with_r32)</span>
 <span id="L148" class="LineNr">148 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L149" class="LineNr">149 </span><span class="Special">% Reg[EBX].i = 0xaabbc0d0;</span>
+<span id="L149" class="LineNr">149 </span><span class="Special">% Reg[EBX].i = 0xa0b0c0d0;</span>
 <span id="L150" class="LineNr">150 </span>== <span class="Constant">0x1</span>
 <span id="L151" class="LineNr">151 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L152" class="LineNr">152 </span>  <span class="Constant">31</span>  d8                                      <span class="Comment"># xor EBX with destination EAX</span>
+<span id="L152" class="LineNr">152 </span>  <span class="Error">09</span>  d8                                      <span class="Comment"># or EBX with destination EAX</span>
 <span id="L153" class="LineNr">153 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L154" class="LineNr">154 </span><span class="traceContains">+run: xor <a href='010vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L154" class="LineNr">154 </span><span class="traceContains">+run: or <a href='010vm.cc.html#L16'>EBX</a> with r/m32</span>
 <span id="L155" class="LineNr">155 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L13'>EAX</a></span>
-<span id="L156" class="LineNr">156 </span><span class="traceContains">+run: storing 0xa0b0ccdd</span>
+<span id="L156" class="LineNr">156 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
 <span id="L157" class="LineNr">157 </span>
 <span id="L158" class="LineNr">158 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L159" class="LineNr">159 </span><span class="Normal">case</span> <span class="Constant">0x31</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
-<span id="L160" class="LineNr">160 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L159" class="LineNr">159 </span><span class="Normal">case</span> <span class="Constant">0x09</span>: <span class="Delimiter">{</span>  <span class="Comment">// or r32 with r/m32</span>
+<span id="L160" class="LineNr">160 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
 <span id="L161" class="LineNr">161 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L162" class="LineNr">162 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L163" class="LineNr">163 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L164" class="LineNr">164 </span>  <a href='010vm.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="L162" class="LineNr">162 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L163" class="LineNr">163 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L164" class="LineNr">164 </span>  <a href='010vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L165" class="LineNr">165 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L166" class="LineNr">166 </span><span class="Delimiter">}</span>
 <span id="L167" class="LineNr">167 </span>
-<span id="L168" class="LineNr">168 </span><span class="SalientComment">//:: not</span>
+<span id="L168" class="LineNr">168 </span><span class="SalientComment">//:: xor</span>
 <span id="L169" class="LineNr">169 </span>
 <span id="L170" class="LineNr">170 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L171" class="LineNr">171 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L171" class="LineNr">171 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>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="L172" class="LineNr">172 </span>
-<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(scenario not_r32)</span>
-<span id="L174" class="LineNr">174 </span><span class="Special">% Reg[EBX].i = 0x0f0f00ff;</span>
-<span id="L175" class="LineNr">175 </span>== <span class="Constant">0x1</span>
-<span id="L176" class="LineNr">176 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L177" class="LineNr">177 </span>  f7  c3                                      <span class="Comment"># not EBX</span>
-<span id="L178" class="LineNr">178 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 000 (unused) 011 (dest EBX)</span>
-<span id="L179" class="LineNr">179 </span><span class="traceContains">+run: 'not' of r/m32</span>
-<span id="L180" class="LineNr">180 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L16'>EBX</a></span>
-<span id="L181" class="LineNr">181 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
-<span id="L182" class="LineNr">182 </span>
-<span id="L183" class="LineNr">183 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L184" class="LineNr">184 </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="L185" class="LineNr">185 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
-<span id="L186" class="LineNr">186 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'not' of r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L187" class="LineNr">187 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L188" class="LineNr">188 </span>  *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
-<span id="L189" class="LineNr">189 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L190" class="LineNr">190 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
-<span id="L191" class="LineNr">191 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L192" class="LineNr">192 </span>  <a href='010vm.cc.html#L59'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L193" class="LineNr">193 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L194" class="LineNr">194 </span><span class="Delimiter">}</span>
+<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(scenario xor_r32_with_r32)</span>
+<span id="L174" class="LineNr">174 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L175" class="LineNr">175 </span><span class="Special">% Reg[EBX].i = 0xaabbc0d0;</span>
+<span id="L176" class="LineNr">176 </span>== <span class="Constant">0x1</span>
+<span id="L177" class="LineNr">177 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L178" class="LineNr">178 </span>  <span class="Constant">31</span>  d8                                      <span class="Comment"># xor EBX with destination EAX</span>
+<span id="L179" class="LineNr">179 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L180" class="LineNr">180 </span><span class="traceContains">+run: xor <a href='010vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L181" class="LineNr">181 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L13'>EAX</a></span>
+<span id="L182" class="LineNr">182 </span><span class="traceContains">+run: storing 0xa0b0ccdd</span>
+<span id="L183" class="LineNr">183 </span>
+<span id="L184" class="LineNr">184 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L185" class="LineNr">185 </span><span class="Normal">case</span> <span class="Constant">0x31</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
+<span id="L186" class="LineNr">186 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L188" class="LineNr">188 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L189" class="LineNr">189 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L190" class="LineNr">190 </span>  <a href='010vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L191" class="LineNr">191 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L192" class="LineNr">192 </span><span class="Delimiter">}</span>
+<span id="L193" class="LineNr">193 </span>
+<span id="L194" class="LineNr">194 </span><span class="SalientComment">//:: not</span>
 <span id="L195" class="LineNr">195 </span>
-<span id="L196" class="LineNr">196 </span><span class="SalientComment">//:: compare (cmp)</span>
-<span id="L197" class="LineNr">197 </span>
-<span id="L198" class="LineNr">198 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L199" class="LineNr">199 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;set SF if rm32 &lt; r32&quot;</span><span class="Delimiter">);</span>
-<span id="L200" class="LineNr">200 </span>
-<span id="L201" class="LineNr">201 </span><span class="Delimiter">:(scenario compare_r32_with_r32_greater)</span>
-<span id="L202" class="LineNr">202 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L203" class="LineNr">203 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</span>
-<span id="L204" class="LineNr">204 </span>== <span class="Constant">0x1</span>
-<span id="L205" class="LineNr">205 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L206" class="LineNr">206 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L207" class="LineNr">207 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L208" class="LineNr">208 </span><span class="traceContains">+run: compare <a href='010vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L209" class="LineNr">209 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L13'>EAX</a></span>
-<span id="L210" class="LineNr">210 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L211" class="LineNr">211 </span>
-<span id="L212" class="LineNr">212 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L213" class="LineNr">213 </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="L214" class="LineNr">214 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
-<span id="L215" class="LineNr">215 </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="L216" class="LineNr">216 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L217" class="LineNr">217 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L218" class="LineNr">218 </span>  <span class="Normal">int32_t</span> arg2 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L219" class="LineNr">219 </span>  <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L220" class="LineNr">220 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L221" class="LineNr">221 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L223" class="LineNr">223 </span>  <a href='010vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L224" class="LineNr">224 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L225" class="LineNr">225 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L226" class="LineNr">226 </span><span class="Delimiter">}</span>
-<span id="L227" class="LineNr">227 </span>
-<span id="L228" class="LineNr">228 </span><span class="Delimiter">:(scenario compare_r32_with_r32_lesser)</span>
-<span id="L229" class="LineNr">229 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c07;</span>
-<span id="L230" class="LineNr">230 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L231" class="LineNr">231 </span>== <span class="Constant">0x1</span>
-<span id="L232" class="LineNr">232 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L233" class="LineNr">233 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L234" class="LineNr">234 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L235" class="LineNr">235 </span><span class="traceContains">+run: compare <a href='010vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L236" class="LineNr">236 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L13'>EAX</a></span>
-<span id="L237" class="LineNr">237 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L238" class="LineNr">238 </span>
-<span id="L239" class="LineNr">239 </span><span class="Delimiter">:(scenario compare_r32_with_r32_equal)</span>
-<span id="L240" class="LineNr">240 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L241" class="LineNr">241 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</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>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L245" class="LineNr">245 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L246" class="LineNr">246 </span><span class="traceContains">+run: compare <a href='010vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L247" class="LineNr">247 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L13'>EAX</a></span>
-<span id="L248" class="LineNr">248 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L249" class="LineNr">249 </span>
-<span id="L250" class="LineNr">250 </span><span class="SalientComment">//:: copy (mov)</span>
-<span id="L251" class="LineNr">251 </span>
-<span id="L252" class="LineNr">252 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L253" class="LineNr">253 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L254" class="LineNr">254 </span>
-<span id="L255" class="LineNr">255 </span><span class="Delimiter">:(scenario copy_r32_to_r32)</span>
-<span id="L256" class="LineNr">256 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
+<span id="L196" class="LineNr">196 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L197" class="LineNr">197 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>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="L198" class="LineNr">198 </span>
+<span id="L199" class="LineNr">199 </span><span class="Delimiter">:(scenario not_r32)</span>
+<span id="L200" class="LineNr">200 </span><span class="Special">% Reg[EBX].i = 0x0f0f00ff;</span>
+<span id="L201" class="LineNr">201 </span>== <span class="Constant">0x1</span>
+<span id="L202" class="LineNr">202 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L203" class="LineNr">203 </span>  f7  c3                                      <span class="Comment"># not EBX</span>
+<span id="L204" class="LineNr">204 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 000 (unused) 011 (dest EBX)</span>
+<span id="L205" class="LineNr">205 </span><span class="traceContains">+run: 'not' of r/m32</span>
+<span id="L206" class="LineNr">206 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L16'>EBX</a></span>
+<span id="L207" class="LineNr">207 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
+<span id="L208" class="LineNr">208 </span>
+<span id="L209" class="LineNr">209 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L210" class="LineNr">210 </span><span class="Normal">case</span> <span class="Constant">0xf7</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
+<span id="L211" class="LineNr">211 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
+<span id="L212" class="LineNr">212 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'not' of r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L213" class="LineNr">213 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L214" class="LineNr">214 </span>  *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
+<span id="L215" class="LineNr">215 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L216" class="LineNr">216 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
+<span id="L217" class="LineNr">217 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L218" class="LineNr">218 </span>  <a href='010vm.cc.html#L59'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L219" class="LineNr">219 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L220" class="LineNr">220 </span><span class="Delimiter">}</span>
+<span id="L221" class="LineNr">221 </span>
+<span id="L222" class="LineNr">222 </span><span class="SalientComment">//:: compare (cmp)</span>
+<span id="L223" class="LineNr">223 </span>
+<span id="L224" class="LineNr">224 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L225" class="LineNr">225 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;set SF if rm32 &lt; r32&quot;</span><span class="Delimiter">);</span>
+<span id="L226" class="LineNr">226 </span>
+<span id="L227" class="LineNr">227 </span><span class="Delimiter">:(scenario compare_r32_with_r32_greater)</span>
+<span id="L228" class="LineNr">228 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L229" class="LineNr">229 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</span>
+<span id="L230" class="LineNr">230 </span>== <span class="Constant">0x1</span>
+<span id="L231" class="LineNr">231 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L232" class="LineNr">232 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
+<span id="L233" class="LineNr">233 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L234" class="LineNr">234 </span><span class="traceContains">+run: compare <a href='010vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L235" class="LineNr">235 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L13'>EAX</a></span>
+<span id="L236" class="LineNr">236 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
+<span id="L237" class="LineNr">237 </span>
+<span id="L238" class="LineNr">238 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L239" class="LineNr">239 </span><span class="Normal">case</span> <span class="Constant">0x39</span>: <span class="Delimiter">{</span>  <span class="Comment">// set SF if r/m32 &lt; r32</span>
+<span id="L240" class="LineNr">240 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
+<span id="L241" class="LineNr">241 </span>  <span class="Normal">uint8_t</span> reg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L242" class="LineNr">242 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L243" class="LineNr">243 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L244" class="LineNr">244 </span>  <span class="Normal">int32_t</span> arg2 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L245" class="LineNr">245 </span>  <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L246" class="LineNr">246 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L247" class="LineNr">247 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L248" class="LineNr">248 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L249" class="LineNr">249 </span>  <a href='010vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L250" class="LineNr">250 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L251" class="LineNr">251 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L252" class="LineNr">252 </span><span class="Delimiter">}</span>
+<span id="L253" class="LineNr">253 </span>
+<span id="L254" class="LineNr">254 </span><span class="Delimiter">:(scenario compare_r32_with_r32_lesser)</span>
+<span id="L255" class="LineNr">255 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c07;</span>
+<span id="L256" class="LineNr">256 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
 <span id="L257" class="LineNr">257 </span>== <span class="Constant">0x1</span>
 <span id="L258" class="LineNr">258 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L259" class="LineNr">259 </span>  <span class="Constant">89</span>  d8                                      <span class="Comment"># copy EBX to EAX</span>
+<span id="L259" class="LineNr">259 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
 <span id="L260" class="LineNr">260 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L261" class="LineNr">261 </span><span class="traceContains">+run: copy <a href='010vm.cc.html#L16'>EBX</a> to r/m32</span>
+<span id="L261" class="LineNr">261 </span><span class="traceContains">+run: compare <a href='010vm.cc.html#L16'>EBX</a> with r/m32</span>
 <span id="L262" class="LineNr">262 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L13'>EAX</a></span>
-<span id="L263" class="LineNr">263 </span><span class="traceContains">+run: storing 0x000000af</span>
+<span id="L263" class="LineNr">263 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
 <span id="L264" class="LineNr">264 </span>
-<span id="L265" class="LineNr">265 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L266" class="LineNr">266 </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="L267" class="LineNr">267 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
-<span id="L268" class="LineNr">268 </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="L269" class="LineNr">269 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L270" class="LineNr">270 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L271" class="LineNr">271 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L272" class="LineNr">272 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L273" class="LineNr">273 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L274" class="LineNr">274 </span><span class="Delimiter">}</span>
+<span id="L265" class="LineNr">265 </span><span class="Delimiter">:(scenario compare_r32_with_r32_equal)</span>
+<span id="L266" class="LineNr">266 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L267" class="LineNr">267 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
+<span id="L268" class="LineNr">268 </span>== <span class="Constant">0x1</span>
+<span id="L269" class="LineNr">269 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
+<span id="L271" class="LineNr">271 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L272" class="LineNr">272 </span><span class="traceContains">+run: compare <a href='010vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L273" class="LineNr">273 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L13'>EAX</a></span>
+<span id="L274" class="LineNr">274 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
 <span id="L275" class="LineNr">275 </span>
-<span id="L276" class="LineNr">276 </span><span class="SalientComment">//:: xchg</span>
+<span id="L276" class="LineNr">276 </span><span class="SalientComment">//:: copy (mov)</span>
 <span id="L277" class="LineNr">277 </span>
 <span id="L278" class="LineNr">278 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L279" class="LineNr">279 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L279" class="LineNr">279 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r32 to rm32&quot;</span><span class="Delimiter">);</span>
 <span id="L280" class="LineNr">280 </span>
-<span id="L281" class="LineNr">281 </span><span class="Delimiter">:(scenario xchg_r32_with_r32)</span>
+<span id="L281" class="LineNr">281 </span><span class="Delimiter">:(scenario copy_r32_to_r32)</span>
 <span id="L282" class="LineNr">282 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
-<span id="L283" class="LineNr">283 </span><span class="Special">% Reg[EAX].i = 0x2e;</span>
-<span id="L284" class="LineNr">284 </span>== <span class="Constant">0x1</span>
-<span id="L285" class="LineNr">285 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L286" class="LineNr">286 </span>  <span class="Constant">87</span>  d8                                      <span class="Comment"># exchange EBX with EAX</span>
-<span id="L287" class="LineNr">287 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L288" class="LineNr">288 </span><span class="traceContains">+run: exchange <a href='010vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L289" class="LineNr">289 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L13'>EAX</a></span>
-<span id="L290" class="LineNr">290 </span><span class="traceContains">+run: storing 0x000000af in r/m32</span>
-<span id="L291" class="LineNr">291 </span><span class="traceContains">+run: storing 0x0000002e in <a href='010vm.cc.html#L16'>EBX</a></span>
-<span id="L292" class="LineNr">292 </span>
-<span id="L293" class="LineNr">293 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L294" class="LineNr">294 </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="L295" class="LineNr">295 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
-<span id="L296" class="LineNr">296 </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="L297" class="LineNr">297 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Normal">int32_t</span> tmp = *arg1<span class="Delimiter">;</span>
-<span id="L300" class="LineNr">300 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L301" class="LineNr">301 </span>  Reg[reg2]<span class="Delimiter">.</span>i = tmp<span class="Delimiter">;</span>
-<span id="L302" class="LineNr">302 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <span class="Constant">&quot; in r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L303" class="LineNr">303 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; Reg[reg2]<span class="Delimiter">.</span>i &lt;&lt; <span class="Constant">&quot; in &quot;</span> &lt;&lt; <a href='012direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L304" class="LineNr">304 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L305" class="LineNr">305 </span><span class="Delimiter">}</span>
+<span id="L283" class="LineNr">283 </span>== <span class="Constant">0x1</span>
+<span id="L284" class="LineNr">284 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L285" class="LineNr">285 </span>  <span class="Constant">89</span>  d8                                      <span class="Comment"># copy EBX to EAX</span>
+<span id="L286" class="LineNr">286 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L287" class="LineNr">287 </span><span class="traceContains">+run: copy <a href='010vm.cc.html#L16'>EBX</a> to r/m32</span>
+<span id="L288" class="LineNr">288 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L13'>EAX</a></span>
+<span id="L289" class="LineNr">289 </span><span class="traceContains">+run: storing 0x000000af</span>
+<span id="L290" class="LineNr">290 </span>
+<span id="L291" class="LineNr">291 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L292" class="LineNr">292 </span><span class="Normal">case</span> <span class="Constant">0x89</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r32 to r/m32</span>
+<span id="L293" class="LineNr">293 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Normal">uint8_t</span> reg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L295" class="LineNr">295 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L296" class="LineNr">296 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L297" class="LineNr">297 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L298" class="LineNr">298 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L300" class="LineNr">300 </span><span class="Delimiter">}</span>
+<span id="L301" class="LineNr">301 </span>
+<span id="L302" class="LineNr">302 </span><span class="SalientComment">//:: xchg</span>
+<span id="L303" class="LineNr">303 </span>
+<span id="L304" class="LineNr">304 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L305" class="LineNr">305 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;swap the <a href='003trace.cc.html#L74'>contents</a> of r32 and rm32&quot;</span><span class="Delimiter">);</span>
 <span id="L306" class="LineNr">306 </span>
-<span id="L307" class="LineNr">307 </span><span class="SalientComment">//:: push</span>
-<span id="L308" class="LineNr">308 </span>
-<span id="L309" class="LineNr">309 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L310" class="LineNr">310 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L311" class="LineNr">311 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L312" class="LineNr">312 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L313" class="LineNr">313 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L314" class="LineNr">314 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L315" class="LineNr">315 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L316" class="LineNr">316 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L317" class="LineNr">317 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L307" class="LineNr">307 </span><span class="Delimiter">:(scenario xchg_r32_with_r32)</span>
+<span id="L308" class="LineNr">308 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
+<span id="L309" class="LineNr">309 </span><span class="Special">% Reg[EAX].i = 0x2e;</span>
+<span id="L310" class="LineNr">310 </span>== <span class="Constant">0x1</span>
+<span id="L311" class="LineNr">311 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L312" class="LineNr">312 </span>  <span class="Constant">87</span>  d8                                      <span class="Comment"># exchange EBX with EAX</span>
+<span id="L313" class="LineNr">313 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L314" class="LineNr">314 </span><span class="traceContains">+run: exchange <a href='010vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L315" class="LineNr">315 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L13'>EAX</a></span>
+<span id="L316" class="LineNr">316 </span><span class="traceContains">+run: storing 0x000000af in r/m32</span>
+<span id="L317" class="LineNr">317 </span><span class="traceContains">+run: storing 0x0000002e in <a href='010vm.cc.html#L16'>EBX</a></span>
 <span id="L318" class="LineNr">318 </span>
-<span id="L319" class="LineNr">319 </span><span class="Delimiter">:(scenario push_r32)</span>
-<span id="L320" class="LineNr">320 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L321" class="LineNr">321 </span><span class="Special">% Reg[EBX].i = 0x0000000a;</span>
-<span id="L322" class="LineNr">322 </span>== <span class="Constant">0x1</span>
-<span id="L323" class="LineNr">323 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L324" class="LineNr">324 </span>  <span class="Constant">53</span>                                          <span class="Comment"># push EBX to stack</span>
-<span id="L325" class="LineNr">325 </span><span class="traceContains">+run: <a href='012direct_addressing.cc.html#L344'>push</a> <a href='010vm.cc.html#L16'>EBX</a></span>
-<span id="L326" class="LineNr">326 </span><span class="traceContains">+run: decrementing <a href='010vm.cc.html#L17'>ESP</a> to 0x00000060</span>
-<span id="L327" class="LineNr">327 </span><span class="traceContains">+run: pushing value 0x0000000a</span>
-<span id="L328" class="LineNr">328 </span>
-<span id="L329" class="LineNr">329 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L330" class="LineNr">330 </span><span class="Normal">case</span> <span class="Constant">0x50</span>:
-<span id="L331" class="LineNr">331 </span><span class="Normal">case</span> <span class="Constant">0x51</span>:
-<span id="L332" class="LineNr">332 </span><span class="Normal">case</span> <span class="Constant">0x52</span>:
-<span id="L333" class="LineNr">333 </span><span class="Normal">case</span> <span class="Constant">0x53</span>:
-<span id="L334" class="LineNr">334 </span><span class="Normal">case</span> <span class="Constant">0x54</span>:
-<span id="L335" class="LineNr">335 </span><span class="Normal">case</span> <span class="Constant">0x55</span>:
-<span id="L336" class="LineNr">336 </span><span class="Normal">case</span> <span class="Constant">0x56</span>:
-<span id="L337" class="LineNr">337 </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="L338" class="LineNr">338 </span>  <span class="Normal">uint8_t</span> <a href='010vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L339" class="LineNr">339 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span><a href='010vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L340" class="LineNr">340 </span>  <a href='012direct_addressing.cc.html#L344'>push</a><span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L341" class="LineNr">341 </span>  <span class="Identifier">break</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="Delimiter">:(code)</span>
-<span id="L344" class="LineNr">344 </span><span class="Normal">void</span> <a href='012direct_addressing.cc.html#L344'>push</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L345" class="LineNr">345 </span>  Reg[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L346" class="LineNr">346 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrementing <a href='010vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L347" class="LineNr">347 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pushing value 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L348" class="LineNr">348 </span>  <a href='010vm.cc.html#L136'>write_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
-<span id="L349" class="LineNr">349 </span><span class="Delimiter">}</span>
-<span id="L350" class="LineNr">350 </span>
-<span id="L351" class="LineNr">351 </span><span class="SalientComment">//:: pop</span>
-<span id="L352" class="LineNr">352 </span>
-<span id="L353" class="LineNr">353 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L354" class="LineNr">354 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L355" class="LineNr">355 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L356" class="LineNr">356 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L357" class="LineNr">357 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L358" class="LineNr">358 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L359" class="LineNr">359 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L360" class="LineNr">360 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L361" class="LineNr">361 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>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="L362" class="LineNr">362 </span>
-<span id="L363" class="LineNr">363 </span><span class="Delimiter">:(scenario pop_r32)</span>
-<span id="L364" class="LineNr">364 </span><span class="Special">% Reg[ESP].u = 0x60;</span>
-<span id="L365" class="LineNr">365 </span><span class="Special">% write_mem_i32(0x60, 0x0000000a);</span>
-<span id="L366" class="LineNr">366 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L367" class="LineNr">367 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L368" class="LineNr">368 </span>  5b                                          <span class="Comment"># pop stack to EBX</span>
-<span id="L369" class="LineNr">369 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L370" class="LineNr">370 </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="L371" class="LineNr">371 </span><span class="traceContains">+run: <a href='012direct_addressing.cc.html#L390'>pop</a> into <a href='010vm.cc.html#L16'>EBX</a></span>
-<span id="L372" class="LineNr">372 </span><span class="traceContains">+run: popping value 0x0000000a</span>
-<span id="L373" class="LineNr">373 </span><span class="traceContains">+run: incrementing <a href='010vm.cc.html#L17'>ESP</a> to 0x00000064</span>
-<span id="L374" class="LineNr">374 </span>
-<span id="L375" class="LineNr">375 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L376" class="LineNr">376 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
-<span id="L377" class="LineNr">377 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
-<span id="L378" class="LineNr">378 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
-<span id="L379" class="LineNr">379 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
-<span id="L380" class="LineNr">380 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
-<span id="L381" class="LineNr">381 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
-<span id="L382" class="LineNr">382 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
-<span id="L383" class="LineNr">383 </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="L384" class="LineNr">384 </span>  <span class="Normal">uint8_t</span> <a href='010vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L385" class="LineNr">385 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span><a href='010vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L386" class="LineNr">386 </span>  Reg[reg]<span class="Delimiter">.</span>u = <a href='012direct_addressing.cc.html#L390'>pop</a><span class="Delimiter">();</span>
-<span id="L387" class="LineNr">387 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L388" class="LineNr">388 </span><span class="Delimiter">}</span>
-<span id="L389" class="LineNr">389 </span><span class="Delimiter">:(code)</span>
-<span id="L390" class="LineNr">390 </span><span class="Normal">uint32_t</span> <a href='012direct_addressing.cc.html#L390'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L391" class="LineNr">391 </span>  <span class="Normal">uint32_t</span> result = <a href='010vm.cc.html#L110'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L392" class="LineNr">392 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L393" class="LineNr">393 </span>  Reg[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L394" class="LineNr">394 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L395" class="LineNr">395 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L396" class="LineNr">396 </span><span class="Delimiter">}</span>
+<span id="L319" class="LineNr">319 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L320" class="LineNr">320 </span><span class="Normal">case</span> <span class="Constant">0x87</span>: <span class="Delimiter">{</span>  <span class="Comment">// exchange r32 with r/m32</span>
+<span id="L321" class="LineNr">321 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
+<span id="L322" class="LineNr">322 </span>  <span class="Normal">uint8_t</span> reg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L323" class="LineNr">323 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L324" class="LineNr">324 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L325" class="LineNr">325 </span>  <span class="Normal">int32_t</span> tmp = *arg1<span class="Delimiter">;</span>
+<span id="L326" class="LineNr">326 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L327" class="LineNr">327 </span>  Reg[reg2]<span class="Delimiter">.</span>i = tmp<span class="Delimiter">;</span>
+<span id="L328" class="LineNr">328 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <span class="Constant">&quot; in r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L329" class="LineNr">329 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L239'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L330" class="LineNr">330 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L331" class="LineNr">331 </span><span class="Delimiter">}</span>
+<span id="L332" class="LineNr">332 </span>
+<span id="L333" class="LineNr">333 </span><span class="SalientComment">//:: push</span>
+<span id="L334" class="LineNr">334 </span>
+<span id="L335" class="LineNr">335 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L336" class="LineNr">336 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R0 (EAX) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L337" class="LineNr">337 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R1 (ECX) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L338" class="LineNr">338 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R2 (EDX) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L339" class="LineNr">339 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R3 (EBX) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L340" class="LineNr">340 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R4 (ESP) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L341" class="LineNr">341 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R5 (EBP) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L342" class="LineNr">342 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R6 (ESI) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L343" class="LineNr">343 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R7 (EDI) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L344" class="LineNr">344 </span>
+<span id="L345" class="LineNr">345 </span><span class="Delimiter">:(scenario push_r32)</span>
+<span id="L346" class="LineNr">346 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
+<span id="L347" class="LineNr">347 </span><span class="Special">% Reg[EBX].i = 0x0000000a;</span>
+<span id="L348" class="LineNr">348 </span>== <span class="Constant">0x1</span>
+<span id="L349" class="LineNr">349 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L350" class="LineNr">350 </span>  <span class="Constant">53</span>                                          <span class="Comment"># push EBX to stack</span>
+<span id="L351" class="LineNr">351 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L371'>push</a> <a href='010vm.cc.html#L16'>EBX</a></span>
+<span id="L352" class="LineNr">352 </span><span class="traceContains">+run: decrementing <a href='010vm.cc.html#L17'>ESP</a> to 0x00000060</span>
+<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: pushing value 0x0000000a</span>
+<span id="L354" class="LineNr">354 </span>
+<span id="L355" class="LineNr">355 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L356" class="LineNr">356 </span><span class="Normal">case</span> <span class="Constant">0x50</span>:
+<span id="L357" class="LineNr">357 </span><span class="Normal">case</span> <span class="Constant">0x51</span>:
+<span id="L358" class="LineNr">358 </span><span class="Normal">case</span> <span class="Constant">0x52</span>:
+<span id="L359" class="LineNr">359 </span><span class="Normal">case</span> <span class="Constant">0x53</span>:
+<span id="L360" class="LineNr">360 </span><span class="Normal">case</span> <span class="Constant">0x54</span>:
+<span id="L361" class="LineNr">361 </span><span class="Normal">case</span> <span class="Constant">0x55</span>:
+<span id="L362" class="LineNr">362 </span><span class="Normal">case</span> <span class="Constant">0x56</span>:
+<span id="L363" class="LineNr">363 </span><span class="Normal">case</span> <span class="Constant">0x57</span>: <span class="Delimiter">{</span>  <span class="Comment">// push r32 to stack</span>
+<span id="L364" class="LineNr">364 </span>  <span class="Normal">uint8_t</span> <a href='010vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L365" class="LineNr">365 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L366" class="LineNr">366 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: &quot; &lt;&lt; NUM(reg) &lt;&lt; &quot;: &quot; &lt;&lt; Reg[reg].u &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
+<span id="L367" class="LineNr">367 </span>  <a href='013direct_addressing.cc.html#L371'>push</a><span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L368" class="LineNr">368 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L369" class="LineNr">369 </span><span class="Delimiter">}</span>
+<span id="L370" class="LineNr">370 </span><span class="Delimiter">:(code)</span>
+<span id="L371" class="LineNr">371 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L371'>push</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L372" class="LineNr">372 </span>  Reg[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L373" class="LineNr">373 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrementing <a href='010vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L374" class="LineNr">374 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pushing value 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L375" class="LineNr">375 </span>  <a href='010vm.cc.html#L136'>write_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
+<span id="L376" class="LineNr">376 </span><span class="Delimiter">}</span>
+<span id="L377" class="LineNr">377 </span>
+<span id="L378" class="LineNr">378 </span><span class="SalientComment">//:: pop</span>
+<span id="L379" class="LineNr">379 </span>
+<span id="L380" class="LineNr">380 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L381" class="LineNr">381 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>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="L382" class="LineNr">382 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>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="L383" class="LineNr">383 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>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="L384" class="LineNr">384 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>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="L385" class="LineNr">385 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>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="L386" class="LineNr">386 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>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="L387" class="LineNr">387 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>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="L388" class="LineNr">388 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>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="L389" class="LineNr">389 </span>
+<span id="L390" class="LineNr">390 </span><span class="Delimiter">:(scenario pop_r32)</span>
+<span id="L391" class="LineNr">391 </span><span class="Special">% Reg[ESP].u = 0x60;</span>
+<span id="L392" class="LineNr">392 </span><span class="Special">% write_mem_i32(0x60, 0x0000000a);</span>
+<span id="L393" class="LineNr">393 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L394" class="LineNr">394 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L395" class="LineNr">395 </span>  5b                                          <span class="Comment"># pop stack to EBX</span>
+<span id="L396" class="LineNr">396 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L397" class="LineNr">397 </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="L398" class="LineNr">398 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L419'>pop</a> into <a href='010vm.cc.html#L16'>EBX</a></span>
+<span id="L399" class="LineNr">399 </span><span class="traceContains">+run: popping value 0x0000000a</span>
+<span id="L400" class="LineNr">400 </span><span class="traceContains">+run: incrementing <a href='010vm.cc.html#L17'>ESP</a> to 0x00000064</span>
+<span id="L401" class="LineNr">401 </span>
+<span id="L402" class="LineNr">402 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L403" class="LineNr">403 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
+<span id="L404" class="LineNr">404 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
+<span id="L405" class="LineNr">405 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
+<span id="L406" class="LineNr">406 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
+<span id="L407" class="LineNr">407 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
+<span id="L408" class="LineNr">408 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
+<span id="L409" class="LineNr">409 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
+<span id="L410" class="LineNr">410 </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="L411" class="LineNr">411 </span>  <span class="Normal">uint8_t</span> <a href='010vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L412" class="LineNr">412 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L413" class="LineNr">413 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;pop from &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
+<span id="L414" class="LineNr">414 </span>  Reg[reg]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L419'>pop</a><span class="Delimiter">();</span>
+<span id="L415" class="LineNr">415 </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="L416" class="LineNr">416 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L417" class="LineNr">417 </span><span class="Delimiter">}</span>
+<span id="L418" class="LineNr">418 </span><span class="Delimiter">:(code)</span>
+<span id="L419" class="LineNr">419 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L419'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L420" class="LineNr">420 </span>  <span class="Normal">uint32_t</span> result = <a href='010vm.cc.html#L110'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L421" class="LineNr">421 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L422" class="LineNr">422 </span>  Reg[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L423" class="LineNr">423 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L424" class="LineNr">424 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L425" class="LineNr">425 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/013immediate_addressing.cc.html b/html/subx/013immediate_addressing.cc.html
deleted file mode 100644
index 169be4fe..00000000
--- a/html/subx/013immediate_addressing.cc.html
+++ /dev/null
@@ -1,476 +0,0 @@
-<!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/013immediate_addressing.cc</title>
-<meta name="Generator" content="Vim/7.4">
-<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; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.traceContains { color: #008000; }
-.cSpecial { 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">//: instructions that (immediately) contain an argument to act with</span>
-<span id="L2" class="LineNr">  2 </span>
-<span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(scenario add_imm32_to_r32)</span>
-<span id="L4" class="LineNr">  4 </span><span class="Special">% Reg[3].i = 1;</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L6" class="LineNr">  6 </span>  <span class="Constant">81</span>  c3                          0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to EBX</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 000 (add imm32) 011 (dest EBX)</span>
-<span id="L8" class="LineNr">  8 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L9" class="LineNr">  9 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L10" class="LineNr"> 10 </span><span class="traceContains">+run: subop add</span>
-<span id="L11" class="LineNr"> 11 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span>
-<span id="L12" class="LineNr"> 12 </span>
-<span id="L13" class="LineNr"> 13 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L14" class="LineNr"> 14 </span><span class="Normal">case</span> <span class="Constant">0x81</span>: <span class="Delimiter">{</span>  <span class="Comment">// combine imm32 with r/m32</span>
-<span id="L15" class="LineNr"> 15 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L16" class="LineNr"> 16 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L17" class="LineNr"> 17 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;combine <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L18" class="LineNr"> 18 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L19" class="LineNr"> 19 </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="L20" class="LineNr"> 20 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="Normal">case</span> <span class="Constant">0</span>:
-<span id="L22" class="LineNr"> 22 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop add&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L23" class="LineNr"> 23 </span>    <a href='010core.cc.html#L43'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L24" class="LineNr"> 24 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Comment">// End Op 81 Subops</span>
-<span id="L26" class="LineNr"> 26 </span>  <span class="Normal">default</span>:
-<span id="L27" class="LineNr"> 27 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after 81: &quot;</span> &lt;&lt; <a href='010core.cc.html#L246'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L28" class="LineNr"> 28 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L29" class="LineNr"> 29 </span>  <span class="Delimiter">}</span>
-<span id="L30" class="LineNr"> 30 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Delimiter">}</span>
-<span id="L32" class="LineNr"> 32 </span>
-<span id="L33" class="LineNr"> 33 </span><span class="Comment">//:</span>
-<span id="L34" class="LineNr"> 34 </span>
-<span id="L35" class="LineNr"> 35 </span><span class="Delimiter">:(scenario add_imm32_to_mem_at_r32)</span>
-<span id="L36" class="LineNr"> 36 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L37" class="LineNr"> 37 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L38" class="LineNr"> 38 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L39" class="LineNr"> 39 </span>  <span class="Constant">81</span>  <span class="PreProc">0</span><span class="Constant">3</span>                          0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to *EBX</span>
-<span id="L40" class="LineNr"> 40 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (add imm32) 011 (dest EBX)</span>
-<span id="L41" class="LineNr"> 41 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L42" class="LineNr"> 42 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L43" class="LineNr"> 43 </span><span class="traceContains">+run: subop add</span>
-<span id="L44" class="LineNr"> 44 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span>
-<span id="L45" class="LineNr"> 45 </span>
-<span id="L46" class="LineNr"> 46 </span><span class="SalientComment">//:: subtract</span>
-<span id="L47" class="LineNr"> 47 </span>
-<span id="L48" class="LineNr"> 48 </span><span class="Delimiter">:(scenario subtract_imm32_from_eax)</span>
-<span id="L49" class="LineNr"> 49 </span><span class="Special">% Reg[EAX].i = 0x0d0c0baa;</span>
-<span id="L50" class="LineNr"> 50 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L51" class="LineNr"> 51 </span>  2d                              0a 0b 0c 0d  <span class="Comment"># subtract 0x0d0c0b0a from EAX</span>
-<span id="L52" class="LineNr"> 52 </span><span class="traceContains">+run: subtract <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a from <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L53" class="LineNr"> 53 </span><span class="traceContains">+run: storing 0x000000a0</span>
-<span id="L54" class="LineNr"> 54 </span>
-<span id="L55" class="LineNr"> 55 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L56" class="LineNr"> 56 </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="L57" class="LineNr"> 57 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L58" class="LineNr"> 58 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L59" class="LineNr"> 59 </span>  <a href='010core.cc.html#L43'>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="L60" class="LineNr"> 60 </span>  <span class="Identifier">break</span><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="Comment">//:</span>
-<span id="L64" class="LineNr"> 64 </span>
-<span id="L65" class="LineNr"> 65 </span><span class="Delimiter">:(scenario subtract_imm32_from_mem_at_r32)</span>
-<span id="L66" class="LineNr"> 66 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L67" class="LineNr"> 67 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 10);</span>
-<span id="L68" class="LineNr"> 68 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L69" class="LineNr"> 69 </span>  <span class="Constant">81</span>  2b                          <span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># subtract 1 from *EBX</span>
-<span id="L70" class="LineNr"> 70 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 101 (subtract imm32) 011 (dest EBX)</span>
-<span id="L71" class="LineNr"> 71 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x00000001 with r/m32</span>
-<span id="L72" class="LineNr"> 72 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L73" class="LineNr"> 73 </span><span class="traceContains">+run: subop subtract</span>
-<span id="L74" class="LineNr"> 74 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L75" class="LineNr"> 75 </span>
-<span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L77" class="LineNr"> 77 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>
-<span id="L78" class="LineNr"> 78 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop subtract&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L79" class="LineNr"> 79 </span>  <a href='010core.cc.html#L43'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L81" class="LineNr"> 81 </span><span class="Delimiter">}</span>
-<span id="L82" class="LineNr"> 82 </span>
-<span id="L83" class="LineNr"> 83 </span><span class="Comment">//:</span>
-<span id="L84" class="LineNr"> 84 </span>
-<span id="L85" class="LineNr"> 85 </span><span class="Delimiter">:(scenario subtract_imm32_from_r32)</span>
-<span id="L86" class="LineNr"> 86 </span><span class="Special">% Reg[3].i = 10;</span>
-<span id="L87" class="LineNr"> 87 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L88" class="LineNr"> 88 </span>  <span class="Constant">81</span>  eb                          <span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># subtract 1 from EBX</span>
-<span id="L89" class="LineNr"> 89 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subtract imm32) 011 (dest EBX)</span>
-<span id="L90" class="LineNr"> 90 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x00000001 with r/m32</span>
-<span id="L91" class="LineNr"> 91 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L92" class="LineNr"> 92 </span><span class="traceContains">+run: subop subtract</span>
-<span id="L93" class="LineNr"> 93 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L94" class="LineNr"> 94 </span>
-<span id="L95" class="LineNr"> 95 </span><span class="SalientComment">//:: and</span>
-<span id="L96" class="LineNr"> 96 </span>
-<span id="L97" class="LineNr"> 97 </span><span class="Delimiter">:(scenario and_imm32_with_eax)</span>
-<span id="L98" class="LineNr"> 98 </span><span class="Special">% Reg[EAX].i = 0xff;</span>
-<span id="L99" class="LineNr"> 99 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Constant">25</span>                              0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EAX</span>
-<span id="L101" class="LineNr">101 </span><span class="traceContains">+run: and <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L102" class="LineNr">102 </span><span class="traceContains">+run: storing 0x0000000a</span>
-<span id="L103" class="LineNr">103 </span>
-<span id="L104" class="LineNr">104 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L105" class="LineNr">105 </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="L106" class="LineNr">106 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L107" class="LineNr">107 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L108" class="LineNr">108 </span>  <a href='010core.cc.html#L55'>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="L109" class="LineNr">109 </span>  <span class="Identifier">break</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="Comment">//:</span>
-<span id="L113" class="LineNr">113 </span>
-<span id="L114" class="LineNr">114 </span><span class="Delimiter">:(scenario and_imm32_with_mem_at_r32)</span>
-<span id="L115" class="LineNr">115 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L116" class="LineNr">116 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x000000ff);</span>
-<span id="L117" class="LineNr">117 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L118" class="LineNr">118 </span>  <span class="Constant">81</span>  <span class="Constant">23</span>                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with *EBX</span>
-<span id="L119" class="LineNr">119 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 100 (and imm32) 011 (dest EBX)</span>
-<span id="L120" class="LineNr">120 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L121" class="LineNr">121 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L122" class="LineNr">122 </span><span class="traceContains">+run: subop and</span>
-<span id="L123" class="LineNr">123 </span><span class="traceContains">+run: storing 0x0000000a</span>
-<span id="L124" class="LineNr">124 </span>
-<span id="L125" class="LineNr">125 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L126" class="LineNr">126 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>
-<span id="L127" class="LineNr">127 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop and&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L128" class="LineNr">128 </span>  <a href='010core.cc.html#L55'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L129" class="LineNr">129 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L130" class="LineNr">130 </span><span class="Delimiter">}</span>
-<span id="L131" class="LineNr">131 </span>
-<span id="L132" class="LineNr">132 </span><span class="Comment">//:</span>
-<span id="L133" class="LineNr">133 </span>
-<span id="L134" class="LineNr">134 </span><span class="Delimiter">:(scenario and_imm32_with_r32)</span>
-<span id="L135" class="LineNr">135 </span><span class="Special">% Reg[3].i = 0xff;</span>
-<span id="L136" class="LineNr">136 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L137" class="LineNr">137 </span>  <span class="Constant">81</span>  e3                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EBX</span>
-<span id="L138" class="LineNr">138 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (and imm32) 011 (dest EBX)</span>
-<span id="L139" class="LineNr">139 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L140" class="LineNr">140 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L141" class="LineNr">141 </span><span class="traceContains">+run: subop and</span>
-<span id="L142" class="LineNr">142 </span><span class="traceContains">+run: storing 0x0000000a</span>
-<span id="L143" class="LineNr">143 </span>
-<span id="L144" class="LineNr">144 </span><span class="SalientComment">//:: or</span>
-<span id="L145" class="LineNr">145 </span>
-<span id="L146" class="LineNr">146 </span><span class="Delimiter">:(scenario or_imm32_with_eax)</span>
-<span id="L147" class="LineNr">147 </span><span class="Special">% Reg[EAX].i = 0xd0c0b0a0;</span>
-<span id="L148" class="LineNr">148 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L149" class="LineNr">149 </span>  0d                              0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EAX</span>
-<span id="L150" class="LineNr">150 </span><span class="traceContains">+run: or <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L151" class="LineNr">151 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L152" class="LineNr">152 </span>
-<span id="L153" class="LineNr">153 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L154" class="LineNr">154 </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="L155" class="LineNr">155 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L156" class="LineNr">156 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L157" class="LineNr">157 </span>  <a href='010core.cc.html#L55'>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="L158" class="LineNr">158 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L159" class="LineNr">159 </span><span class="Delimiter">}</span>
-<span id="L160" class="LineNr">160 </span>
-<span id="L161" class="LineNr">161 </span><span class="Comment">//:</span>
-<span id="L162" class="LineNr">162 </span>
-<span id="L163" class="LineNr">163 </span><span class="Delimiter">:(scenario or_imm32_with_mem_at_r32)</span>
-<span id="L164" class="LineNr">164 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L165" class="LineNr">165 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0xd0c0b0a0);</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">81</span>  0b                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with *EBX</span>
-<span id="L168" class="LineNr">168 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 001 (or imm32) 011 (dest EBX)</span>
-<span id="L169" class="LineNr">169 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L170" class="LineNr">170 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L171" class="LineNr">171 </span><span class="traceContains">+run: subop or</span>
-<span id="L172" class="LineNr">172 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L173" class="LineNr">173 </span>
-<span id="L174" class="LineNr">174 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L175" class="LineNr">175 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>
-<span id="L176" class="LineNr">176 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop or&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L177" class="LineNr">177 </span>  <a href='010core.cc.html#L55'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L178" class="LineNr">178 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L179" class="LineNr">179 </span><span class="Delimiter">}</span>
-<span id="L180" class="LineNr">180 </span>
-<span id="L181" class="LineNr">181 </span><span class="Delimiter">:(scenario or_imm32_with_r32)</span>
-<span id="L182" class="LineNr">182 </span><span class="Special">% Reg[3].i = 0xd0c0b0a0;</span>
-<span id="L183" class="LineNr">183 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L184" class="LineNr">184 </span>  <span class="Constant">81</span>  cb                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EBX</span>
-<span id="L185" class="LineNr">185 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (or imm32) 011 (dest EBX)</span>
-<span id="L186" class="LineNr">186 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L187" class="LineNr">187 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L188" class="LineNr">188 </span><span class="traceContains">+run: subop or</span>
-<span id="L189" class="LineNr">189 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L190" class="LineNr">190 </span>
-<span id="L191" class="LineNr">191 </span><span class="SalientComment">//:: xor</span>
-<span id="L192" class="LineNr">192 </span>
-<span id="L193" class="LineNr">193 </span><span class="Delimiter">:(scenario xor_imm32_with_eax)</span>
-<span id="L194" class="LineNr">194 </span><span class="Special">% Reg[EAX].i = 0xddccb0a0;</span>
-<span id="L195" class="LineNr">195 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L196" class="LineNr">196 </span>  <span class="Constant">35</span>                              0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EAX</span>
-<span id="L197" class="LineNr">197 </span><span class="traceContains">+run: xor <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L198" class="LineNr">198 </span><span class="traceContains">+run: storing 0xd0c0bbaa</span>
-<span id="L199" class="LineNr">199 </span>
-<span id="L200" class="LineNr">200 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L201" class="LineNr">201 </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="L202" class="LineNr">202 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L203" class="LineNr">203 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L204" class="LineNr">204 </span>  <a href='010core.cc.html#L55'>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="L205" class="LineNr">205 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L206" class="LineNr">206 </span><span class="Delimiter">}</span>
-<span id="L207" class="LineNr">207 </span>
-<span id="L208" class="LineNr">208 </span><span class="Comment">//:</span>
-<span id="L209" class="LineNr">209 </span>
-<span id="L210" class="LineNr">210 </span><span class="Delimiter">:(scenario xor_imm32_with_mem_at_r32)</span>
-<span id="L211" class="LineNr">211 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L212" class="LineNr">212 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0xd0c0b0a0);</span>
-<span id="L213" class="LineNr">213 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L214" class="LineNr">214 </span>  <span class="Constant">81</span>  <span class="Constant">33</span>                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with *EBX</span>
-<span id="L215" class="LineNr">215 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (xor imm32) 011 (dest EBX)</span>
-<span id="L216" class="LineNr">216 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L217" class="LineNr">217 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L218" class="LineNr">218 </span><span class="traceContains">+run: subop xor</span>
-<span id="L219" class="LineNr">219 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L220" class="LineNr">220 </span>
-<span id="L221" class="LineNr">221 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L222" class="LineNr">222 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>
-<span id="L223" class="LineNr">223 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop xor&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L224" class="LineNr">224 </span>  <a href='010core.cc.html#L55'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<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>
-<span id="L226" class="LineNr">226 </span><span class="Delimiter">}</span>
-<span id="L227" class="LineNr">227 </span>
-<span id="L228" class="LineNr">228 </span><span class="Delimiter">:(scenario xor_imm32_with_r32)</span>
-<span id="L229" class="LineNr">229 </span><span class="Special">% Reg[3].i = 0xd0c0b0a0;</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">81</span>  f3                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EBX</span>
-<span id="L232" class="LineNr">232 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 110 (xor imm32) 011 (dest EBX)</span>
-<span id="L233" class="LineNr">233 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L234" class="LineNr">234 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L235" class="LineNr">235 </span><span class="traceContains">+run: subop xor</span>
-<span id="L236" class="LineNr">236 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L237" class="LineNr">237 </span>
-<span id="L238" class="LineNr">238 </span><span class="SalientComment">//:: compare (cmp)</span>
-<span id="L239" class="LineNr">239 </span>
-<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_greater)</span>
-<span id="L241" class="LineNr">241 </span><span class="Special">% Reg[0].i = 0x0d0c0b0a;</span>
-<span id="L242" class="LineNr">242 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L243" class="LineNr">243 </span>  3d                              <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with EAX</span>
-<span id="L244" class="LineNr">244 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L7'>EAX</a> and <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b07</span>
-<span id="L245" class="LineNr">245 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L246" class="LineNr">246 </span>
-<span id="L247" class="LineNr">247 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L248" class="LineNr">248 </span><span class="Normal">case</span> <span class="Constant">0x3d</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract imm32 from EAX</span>
-<span id="L249" class="LineNr">249 </span>  <span class="Normal">int32_t</span> arg1 = Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L250" class="LineNr">250 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L251" class="LineNr">251 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L7'>EAX</a> and <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L252" class="LineNr">252 </span>  <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span>
-<span id="L253" class="LineNr">253 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L254" class="LineNr">254 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L255" class="LineNr">255 </span>  <span class="Normal">int64_t</span> tmp2 = arg1 - arg2<span class="Delimiter">;</span>
-<span id="L256" class="LineNr">256 </span>  <a href='010core.cc.html#L33'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L257" class="LineNr">257 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L33'>OF</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L258" class="LineNr">258 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L259" class="LineNr">259 </span><span class="Delimiter">}</span>
-<span id="L260" class="LineNr">260 </span>
-<span id="L261" class="LineNr">261 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_lesser)</span>
-<span id="L262" class="LineNr">262 </span><span class="Special">% Reg[0].i = 0x0d0c0b07;</span>
-<span id="L263" class="LineNr">263 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L264" class="LineNr">264 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX</span>
-<span id="L265" class="LineNr">265 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L7'>EAX</a> and <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a</span>
-<span id="L266" class="LineNr">266 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L267" class="LineNr">267 </span>
-<span id="L268" class="LineNr">268 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_equal)</span>
-<span id="L269" class="LineNr">269 </span><span class="Special">% Reg[0].i = 0x0d0c0b0a;</span>
-<span id="L270" class="LineNr">270 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L271" class="LineNr">271 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX</span>
-<span id="L272" class="LineNr">272 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L7'>EAX</a> and <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a</span>
-<span id="L273" class="LineNr">273 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L274" class="LineNr">274 </span>
-<span id="L275" class="LineNr">275 </span><span class="Comment">//:</span>
-<span id="L276" class="LineNr">276 </span>
-<span id="L277" class="LineNr">277 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_greater)</span>
-<span id="L278" class="LineNr">278 </span><span class="Special">% Reg[3].i = 0x0d0c0b0a;</span>
-<span id="L279" class="LineNr">279 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L280" class="LineNr">280 </span>  <span class="Constant">81</span>  fb                          <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with EBX</span>
-<span id="L281" class="LineNr">281 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L282" class="LineNr">282 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b07 with r/m32</span>
-<span id="L283" class="LineNr">283 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L284" class="LineNr">284 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L285" class="LineNr">285 </span>
-<span id="L286" class="LineNr">286 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L287" class="LineNr">287 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>
-<span id="L288" class="LineNr">288 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop compare&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L289" class="LineNr">289 </span>  <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L290" class="LineNr">290 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L291" class="LineNr">291 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L292" class="LineNr">292 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L293" class="LineNr">293 </span>  <a href='010core.cc.html#L33'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L294" class="LineNr">294 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L33'>OF</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L295" class="LineNr">295 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L296" class="LineNr">296 </span><span class="Delimiter">}</span>
-<span id="L297" class="LineNr">297 </span>
-<span id="L298" class="LineNr">298 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_lesser)</span>
-<span id="L299" class="LineNr">299 </span><span class="Special">% Reg[3].i = 0x0d0c0b07;</span>
-<span id="L300" class="LineNr">300 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L301" class="LineNr">301 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX</span>
-<span id="L302" class="LineNr">302 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L303" class="LineNr">303 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L304" class="LineNr">304 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L305" class="LineNr">305 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L306" class="LineNr">306 </span>
-<span id="L307" class="LineNr">307 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_equal)</span>
-<span id="L308" class="LineNr">308 </span><span class="Special">% Reg[3].i = 0x0d0c0b0a;</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">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX</span>
-<span id="L311" class="LineNr">311 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L312" class="LineNr">312 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L313" class="LineNr">313 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L10'>EBX</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="Delimiter">:(scenario compare_imm32_with_mem_at_r32_greater)</span>
-<span id="L317" class="LineNr">317 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L318" class="LineNr">318 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0d0c0b0a);</span>
-<span id="L319" class="LineNr">319 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L320" class="LineNr">320 </span>  <span class="Constant">81</span>  3b                          <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with *EBX</span>
-<span id="L321" class="LineNr">321 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L322" class="LineNr">322 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b07 with r/m32</span>
-<span id="L323" class="LineNr">323 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L324" class="LineNr">324 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L325" class="LineNr">325 </span>
-<span id="L326" class="LineNr">326 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_lesser)</span>
-<span id="L327" class="LineNr">327 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L328" class="LineNr">328 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0d0c0b07);</span>
-<span id="L329" class="LineNr">329 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L330" class="LineNr">330 </span>  <span class="Constant">81</span>  3b                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with *EBX</span>
-<span id="L331" class="LineNr">331 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L332" class="LineNr">332 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L333" class="LineNr">333 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L334" class="LineNr">334 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L335" class="LineNr">335 </span>
-<span id="L336" class="LineNr">336 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_equal)</span>
-<span id="L337" class="LineNr">337 </span><span class="Special">% Reg[3].i = 0x0d0c0b0a;</span>
-<span id="L338" class="LineNr">338 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L339" class="LineNr">339 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0d0c0b0a);</span>
-<span id="L340" class="LineNr">340 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L341" class="LineNr">341 </span>  <span class="Constant">81</span>  3b                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with *EBX</span>
-<span id="L342" class="LineNr">342 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L343" class="LineNr">343 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L344" class="LineNr">344 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L345" class="LineNr">345 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L346" class="LineNr">346 </span>
-<span id="L347" class="LineNr">347 </span><span class="SalientComment">//:: copy (mov)</span>
-<span id="L348" class="LineNr">348 </span>
-<span id="L349" class="LineNr">349 </span><span class="Delimiter">:(scenario copy_imm32_to_r32)</span>
-<span id="L350" class="LineNr">350 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L351" class="LineNr">351 </span>  bb                              0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to EBX</span>
-<span id="L352" class="LineNr">352 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a to <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L353" class="LineNr">353 </span>
-<span id="L354" class="LineNr">354 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L355" class="LineNr">355 </span><span class="Normal">case</span> <span class="Constant">0xb8</span>:
-<span id="L356" class="LineNr">356 </span><span class="Normal">case</span> <span class="Constant">0xb9</span>:
-<span id="L357" class="LineNr">357 </span><span class="Normal">case</span> <span class="Constant">0xba</span>:
-<span id="L358" class="LineNr">358 </span><span class="Normal">case</span> <span class="Constant">0xbb</span>:
-<span id="L359" class="LineNr">359 </span><span class="Normal">case</span> <span class="Constant">0xbc</span>:
-<span id="L360" class="LineNr">360 </span><span class="Normal">case</span> <span class="Constant">0xbd</span>:
-<span id="L361" class="LineNr">361 </span><span class="Normal">case</span> <span class="Constant">0xbe</span>:
-<span id="L362" class="LineNr">362 </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="L363" class="LineNr">363 </span>  <span class="Normal">uint8_t</span> reg1 = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L364" class="LineNr">364 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L365" class="LineNr">365 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='010core.cc.html#L227'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L366" class="LineNr">366 </span>  Reg[reg1]<span class="Delimiter">.</span>i = arg2<span class="Delimiter">;</span>
-<span id="L367" class="LineNr">367 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L368" class="LineNr">368 </span><span class="Delimiter">}</span>
-<span id="L369" class="LineNr">369 </span>
-<span id="L370" class="LineNr">370 </span><span class="Comment">//:</span>
-<span id="L371" class="LineNr">371 </span>
-<span id="L372" class="LineNr">372 </span><span class="Delimiter">:(scenario copy_imm32_to_mem_at_r32)</span>
-<span id="L373" class="LineNr">373 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L374" class="LineNr">374 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L375" class="LineNr">375 </span>  c7  <span class="PreProc">0</span><span class="Constant">3</span>                          0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to *EBX</span>
-<span id="L376" class="LineNr">376 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (unused) 011 (dest EBX)</span>
-<span id="L377" class="LineNr">377 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a to r/m32</span>
-<span id="L378" class="LineNr">378 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L379" class="LineNr">379 </span>
-<span id="L380" class="LineNr">380 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L381" class="LineNr">381 </span><span class="Normal">case</span> <span class="Constant">0xc7</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
-<span id="L382" class="LineNr">382 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L383" class="LineNr">383 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L384" class="LineNr">384 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L385" class="LineNr">385 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L386" class="LineNr">386 </span>  *arg1 = arg2<span class="Delimiter">;</span>
-<span id="L387" class="LineNr">387 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L388" class="LineNr">388 </span><span class="Delimiter">}</span>
-<span id="L389" class="LineNr">389 </span>
-<span id="L390" class="LineNr">390 </span><span class="SalientComment">//:: push</span>
-<span id="L391" class="LineNr">391 </span>
-<span id="L392" class="LineNr">392 </span><span class="Delimiter">:(scenario push_imm32)</span>
-<span id="L393" class="LineNr">393 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
-<span id="L394" class="LineNr">394 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L395" class="LineNr">395 </span>  <span class="Constant">68</span>                              af <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># push *EAX to stack</span>
-<span id="L396" class="LineNr">396 </span><span class="traceContains">+run: <a href='011direct_addressing.cc.html#L283'>push</a> <a href='010core.cc.html#L219'>imm32</a> 0x000000af</span>
-<span id="L397" class="LineNr">397 </span><span class="traceContains">+run: <a href='010core.cc.html#L11'>ESP</a> is now 0x00000010</span>
-<span id="L398" class="LineNr">398 </span><span class="traceContains">+run: <a href='003trace.cc.html#L74'>contents</a> at <a href='010core.cc.html#L11'>ESP</a>: 0x000000af</span>
-<span id="L399" class="LineNr">399 </span>
-<span id="L400" class="LineNr">400 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L401" class="LineNr">401 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span>
-<span id="L402" class="LineNr">402 </span>  <span class="Normal">int32_t</span> val = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L403" class="LineNr">403 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L404" class="LineNr">404 </span>  Reg[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L405" class="LineNr">405 </span>  *<span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>&amp;Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">))</span> = val<span class="Delimiter">;</span>
-<span id="L406" class="LineNr">406 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ESP is now 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L407" class="LineNr">407 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;contents at <a href='010core.cc.html#L11'>ESP</a>: 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; *<span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>&amp;Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L408" class="LineNr">408 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L409" class="LineNr">409 </span><span class="Delimiter">}</span>
-</pre>
-</body>
-</html>
-<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/014index_addressing.cc.html b/html/subx/014index_addressing.cc.html
deleted file mode 100644
index c8562245..00000000
--- a/html/subx/014index_addressing.cc.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!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/014index_addressing.cc</title>
-<meta name="Generator" content="Vim/7.4">
-<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; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.traceContains { color: #008000; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
--->
-</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">//: operating on memory at the address provided by some register plus optional scale and offset</span>
-<span id="L2" class="LineNr">  2 </span>
-<span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_with_sib)</span>
-<span id="L4" class="LineNr">  4 </span><span class="Special">% Reg[3].i = 0x10;</span>
-<span id="L5" class="LineNr">  5 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L6" class="LineNr">  6 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L8" class="LineNr">  8 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  1c      <span class="Constant">20</span>                             <span class="Comment"># add EBX to *EAX</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 100 (dest in SIB)</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment"># SIB in binary: 00 (scale 1) 100 (no index) 000 (base EAX)</span>
-<span id="L11" class="LineNr"> 11 </span><span class="traceContains">+run: add <a href='010core.cc.html#L10'>EBX</a> to r/m32</span>
-<span id="L12" class="LineNr"> 12 </span><span class="traceContains">+run: effective address is initially 0x60 (EAX)</span>
-<span id="L13" class="LineNr"> 13 </span><span class="traceContains">+run: effective address is 0x60</span>
-<span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L15" class="LineNr"> 15 </span>
-<span id="L16" class="LineNr"> 16 </span><span class="Delimiter">:(before &quot;End Mod 0 Special-cases(addr)&quot;)</span>
-<span id="L17" class="LineNr"> 17 </span><span class="Normal">case</span> <span class="Constant">4</span>:  <span class="Comment">// exception: mod 0b00 rm 0b100 =&gt; incoming SIB (scale-index-base) byte</span>
-<span id="L18" class="LineNr"> 18 </span>  addr = <a href='014index_addressing.cc.html#L21'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span>
-<span id="L19" class="LineNr"> 19 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Delimiter">:(code)</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Normal">uint32_t</span> <a href='014index_addressing.cc.html#L21'>effective_address_from_sib</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Normal">uint8_t</span> sib = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L23" class="LineNr"> 23 </span>  <span class="Normal">uint8_t</span> base = sib&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Normal">uint32_t</span> addr = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base != <a href='010core.cc.html#L12'>EBP</a> || mod != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L26" class="LineNr"> 26 </span>    addr = Reg[base]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L27" class="LineNr"> 27 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L28" class="LineNr"> 28 </span>  <span class="Delimiter">}</span>
-<span id="L29" class="LineNr"> 29 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L30" class="LineNr"> 30 </span>    <span class="Comment">// base == EBP &amp;&amp; mod == 0</span>
-<span id="L31" class="LineNr"> 31 </span>    addr = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>  <span class="Comment">// ignore base</span>
-<span id="L32" class="LineNr"> 32 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L33" class="LineNr"> 33 </span>  <span class="Delimiter">}</span>
-<span id="L34" class="LineNr"> 34 </span>  <span class="Normal">uint8_t</span> index = <span class="Delimiter">(</span>sib&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L35" class="LineNr"> 35 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>index == <a href='010core.cc.html#L11'>ESP</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L36" class="LineNr"> 36 </span>    <span class="Comment">// ignore index and scale</span>
-<span id="L37" class="LineNr"> 37 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L38" class="LineNr"> 38 </span>  <span class="Delimiter">}</span>
-<span id="L39" class="LineNr"> 39 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L40" class="LineNr"> 40 </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="L41" class="LineNr"> 41 </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="L42" class="LineNr"> 42 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L227'>rname</a><span class="Delimiter">(</span>index<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;*&quot;</span> &lt;&lt; <a href='010core.cc.html#L246'>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#L184'>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="Identifier">return</span> addr<span class="Delimiter">;</span>
-<span id="L45" class="LineNr"> 45 </span><span class="Delimiter">}</span>
-<span id="L46" class="LineNr"> 46 </span>
-<span id="L47" class="LineNr"> 47 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_base_r32_index_r32)</span>
-<span id="L48" class="LineNr"> 48 </span><span class="Special">% Reg[3].i = 0x10;  // source</span>
-<span id="L49" class="LineNr"> 49 </span><span class="Special">% Reg[0].i = 0x5e;  // dest base</span>
-<span id="L50" class="LineNr"> 50 </span><span class="Special">% Reg[1].i = 0x2;  // dest index</span>
-<span id="L51" class="LineNr"> 51 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L52" class="LineNr"> 52 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L53" class="LineNr"> 53 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  1c      <span class="Error">08</span>                             <span class="Comment"># add EBX to *(EAX+ECX)</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 100 (dest in SIB)</span>
-<span id="L55" class="LineNr"> 55 </span><span class="Comment"># SIB in binary: 00 (scale 1) 001 (index ECX) 000 (base EAX)</span>
-<span id="L56" class="LineNr"> 56 </span><span class="traceContains">+run: add <a href='010core.cc.html#L10'>EBX</a> to r/m32</span>
-<span id="L57" class="LineNr"> 57 </span><span class="traceContains">+run: effective address is initially 0x5e (EAX)</span>
-<span id="L58" class="LineNr"> 58 </span><span class="traceContains">+run: effective address is 0x60 (after adding ECX*1)</span>
-<span id="L59" class="LineNr"> 59 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L60" class="LineNr"> 60 </span>
-<span id="L61" class="LineNr"> 61 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_displacement_using_sib)</span>
-<span id="L62" class="LineNr"> 62 </span><span class="Special">% Reg[3].i = 0x10;  // source</span>
-<span id="L63" class="LineNr"> 63 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L64" class="LineNr"> 64 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L65" class="LineNr"> 65 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  1c      <span class="Constant">25</span>    <span class="Constant">60</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>              <span class="Comment"># add EBX to *0x60</span>
-<span id="L66" class="LineNr"> 66 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 100 (dest in SIB)</span>
-<span id="L67" class="LineNr"> 67 </span><span class="Comment"># SIB in binary: 00 (scale 1) 100 (no index) 101 (not EBP but disp32)</span>
-<span id="L68" class="LineNr"> 68 </span><span class="traceContains">+run: add <a href='010core.cc.html#L10'>EBX</a> to r/m32</span>
-<span id="L69" class="LineNr"> 69 </span><span class="traceContains">+run: effective address is initially 0x60 (disp32)</span>
-<span id="L70" class="LineNr"> 70 </span><span class="traceContains">+run: effective address is 0x60</span>
-<span id="L71" class="LineNr"> 71 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L72" class="LineNr"> 72 </span>
-<span id="L73" class="LineNr"> 73 </span><span class="Comment">//:</span>
-<span id="L74" class="LineNr"> 74 </span>
-<span id="L75" class="LineNr"> 75 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_base_r32_index_r32_plus_disp8)</span>
-<span id="L76" class="LineNr"> 76 </span><span class="Special">% Reg[3].i = 0x10;  // source</span>
-<span id="L77" class="LineNr"> 77 </span><span class="Special">% Reg[0].i = 0x59;  // dest base</span>
-<span id="L78" class="LineNr"> 78 </span><span class="Special">% Reg[1].i = 0x5;  // dest index</span>
-<span id="L79" class="LineNr"> 79 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L80" class="LineNr"> 80 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L81" class="LineNr"> 81 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  5c      <span class="Error">08</span>    <span class="PreProc">0</span><span class="Constant">2</span>                       <span class="Comment"># add EBX to *(EAX+ECX+2)</span>
-<span id="L82" class="LineNr"> 82 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 100 (dest in SIB)</span>
-<span id="L83" class="LineNr"> 83 </span><span class="Comment"># SIB in binary: 00 (scale 1) 001 (index ECX) 000 (base EAX)</span>
-<span id="L84" class="LineNr"> 84 </span><span class="traceContains">+run: add <a href='010core.cc.html#L10'>EBX</a> to r/m32</span>
-<span id="L85" class="LineNr"> 85 </span><span class="traceContains">+run: effective address is initially 0x59 (EAX)</span>
-<span id="L86" class="LineNr"> 86 </span><span class="traceContains">+run: effective address is 0x5e (after adding ECX*1)</span>
-<span id="L87" class="LineNr"> 87 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp8)</span>
-<span id="L88" class="LineNr"> 88 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L89" class="LineNr"> 89 </span>
-<span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(before &quot;End Mod 1 Special-cases(addr)&quot;)</span>
-<span id="L91" class="LineNr"> 91 </span><span class="Normal">case</span> <span class="Constant">4</span>:  <span class="Comment">// exception: mod 0b01 rm 0b100 =&gt; incoming SIB (scale-index-base) byte</span>
-<span id="L92" class="LineNr"> 92 </span>  addr = <a href='014index_addressing.cc.html#L21'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L94" class="LineNr"> 94 </span>
-<span id="L95" class="LineNr"> 95 </span><span class="Comment">//:</span>
-<span id="L96" class="LineNr"> 96 </span>
-<span id="L97" class="LineNr"> 97 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_base_r32_index_r32_plus_disp32)</span>
-<span id="L98" class="LineNr"> 98 </span><span class="Special">% Reg[3].i = 0x10;  // source</span>
-<span id="L99" class="LineNr"> 99 </span><span class="Special">% Reg[0].i = 0x59;  // dest base</span>
-<span id="L100" class="LineNr">100 </span><span class="Special">% Reg[1].i = 0x5;  // dest index</span>
-<span id="L101" class="LineNr">101 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L102" class="LineNr">102 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L103" class="LineNr">103 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  9c      <span class="Error">08</span>    <span class="PreProc">0</span><span class="Constant">2</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>              <span class="Comment"># add EBX to *(EAX+ECX+2)</span>
-<span id="L104" class="LineNr">104 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 100 (dest in SIB)</span>
-<span id="L105" class="LineNr">105 </span><span class="Comment"># SIB in binary: 00 (scale 1) 001 (index ECX) 000 (base EAX)</span>
-<span id="L106" class="LineNr">106 </span><span class="traceContains">+run: add <a href='010core.cc.html#L10'>EBX</a> to r/m32</span>
-<span id="L107" class="LineNr">107 </span><span class="traceContains">+run: effective address is initially 0x59 (EAX)</span>
-<span id="L108" class="LineNr">108 </span><span class="traceContains">+run: effective address is 0x5e (after adding ECX*1)</span>
-<span id="L109" class="LineNr">109 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp32)</span>
-<span id="L110" class="LineNr">110 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L111" class="LineNr">111 </span>
-<span id="L112" class="LineNr">112 </span><span class="Delimiter">:(before &quot;End Mod 2 Special-cases(addr)&quot;)</span>
-<span id="L113" class="LineNr">113 </span><span class="Normal">case</span> <span class="Constant">4</span>:  <span class="Comment">// exception: mod 0b10 rm 0b100 =&gt; incoming SIB (scale-index-base) byte</span>
-<span id="L114" class="LineNr">114 </span>  addr = <a href='014index_addressing.cc.html#L21'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span>
-<span id="L115" class="LineNr">115 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-</pre>
-</body>
-</html>
-<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/013indirect_addressing.cc.html b/html/subx/014indirect_addressing.cc.html
index bbf7c550..458e0e78 100644
--- a/html/subx/013indirect_addressing.cc.html
+++ b/html/subx/014indirect_addressing.cc.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/013indirect_addressing.cc</title>
+<title>Mu - subx/014indirect_addressing.cc</title>
 <meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
@@ -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#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>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>
@@ -92,7 +92,7 @@ if ('onhashchange' in window) {
 <span id="L28" class="LineNr"> 28 </span><span class="Comment">//:</span>
 <span id="L29" class="LineNr"> 29 </span>
 <span id="L30" class="LineNr"> 30 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L31" class="LineNr"> 31 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;03&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add rm32 to r32&quot;</span><span class="Delimiter">);</span>
+<span id="L31" class="LineNr"> 31 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;03&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add rm32 to r32&quot;</span><span class="Delimiter">);</span>
 <span id="L32" class="LineNr"> 32 </span>
 <span id="L33" class="LineNr"> 33 </span><span class="Delimiter">:(scenario add_mem_at_r32_to_r32)</span>
 <span id="L34" class="LineNr"> 34 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
@@ -109,10 +109,10 @@ if ('onhashchange' in window) {
 <span id="L45" class="LineNr"> 45 </span>
 <span id="L46" class="LineNr"> 46 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <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='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>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#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>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='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L50" class="LineNr"> 50 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>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='010vm.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>
 <span id="L54" class="LineNr"> 54 </span><span class="Delimiter">}</span>
@@ -135,7 +135,7 @@ if ('onhashchange' in window) {
 <span id="L71" class="LineNr"> 71 </span><span class="Comment">//:</span>
 <span id="L72" class="LineNr"> 72 </span>
 <span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L74" class="LineNr"> 74 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;2b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract rm32 from r32&quot;</span><span class="Delimiter">);</span>
+<span id="L74" class="LineNr"> 74 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;2b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract rm32 from r32&quot;</span><span class="Delimiter">);</span>
 <span id="L75" class="LineNr"> 75 </span>
 <span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(scenario subtract_mem_at_r32_from_r32)</span>
 <span id="L77" class="LineNr"> 77 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
@@ -152,10 +152,10 @@ if ('onhashchange' in window) {
 <span id="L88" class="LineNr"> 88 </span>
 <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <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='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L91" class="LineNr"> 91 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>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#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>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='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L93" class="LineNr"> 93 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>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='010vm.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>
 <span id="L97" class="LineNr"> 97 </span><span class="Delimiter">}</span>
@@ -178,7 +178,7 @@ if ('onhashchange' in window) {
 <span id="L114" class="LineNr">114 </span><span class="Comment">//:</span>
 <span id="L115" class="LineNr">115 </span>
 <span id="L116" class="LineNr">116 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L117" class="LineNr">117 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise AND of r32 with rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L117" class="LineNr">117 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise AND of r32 with rm32&quot;</span><span class="Delimiter">);</span>
 <span id="L118" class="LineNr">118 </span>
 <span id="L119" class="LineNr">119 </span><span class="Delimiter">:(scenario and_mem_at_r32_with_r32)</span>
 <span id="L120" class="LineNr">120 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
@@ -195,10 +195,10 @@ if ('onhashchange' in window) {
 <span id="L131" class="LineNr">131 </span>
 <span id="L132" class="LineNr">132 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L133" class="LineNr">133 </span><span class="Normal">case</span> <span class="Constant">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='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L134" class="LineNr">134 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>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#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>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='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L136" class="LineNr">136 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>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='010vm.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>
 <span id="L140" class="LineNr">140 </span><span class="Delimiter">}</span>
@@ -221,7 +221,7 @@ if ('onhashchange' in window) {
 <span id="L157" class="LineNr">157 </span><span class="Comment">//:</span>
 <span id="L158" class="LineNr">158 </span>
 <span id="L159" class="LineNr">159 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L160" class="LineNr">160 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;0b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise OR of r32 with rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L160" class="LineNr">160 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;0b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise OR of r32 with rm32&quot;</span><span class="Delimiter">);</span>
 <span id="L161" class="LineNr">161 </span>
 <span id="L162" class="LineNr">162 </span><span class="Delimiter">:(scenario or_mem_at_r32_with_r32)</span>
 <span id="L163" class="LineNr">163 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
@@ -238,10 +238,10 @@ if ('onhashchange' in window) {
 <span id="L174" class="LineNr">174 </span>
 <span id="L175" class="LineNr">175 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <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='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L177" class="LineNr">177 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>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#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>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='012direct_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='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>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='010vm.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>
 <span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span>
@@ -264,7 +264,7 @@ if ('onhashchange' in window) {
 <span id="L200" class="LineNr">200 </span><span class="Comment">//:</span>
 <span id="L201" class="LineNr">201 </span>
 <span id="L202" class="LineNr">202 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L203" class="LineNr">203 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;33&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise XOR of r32 with rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L203" class="LineNr">203 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;33&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;r32 = bitwise XOR of r32 with rm32&quot;</span><span class="Delimiter">);</span>
 <span id="L204" class="LineNr">204 </span>
 <span id="L205" class="LineNr">205 </span><span class="Delimiter">:(scenario xor_mem_at_r32_with_r32)</span>
 <span id="L206" class="LineNr">206 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
@@ -281,10 +281,10 @@ if ('onhashchange' in window) {
 <span id="L217" class="LineNr">217 </span>
 <span id="L218" class="LineNr">218 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <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='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L220" class="LineNr">220 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>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#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>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='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L222" class="LineNr">222 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>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='010vm.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>
 <span id="L226" class="LineNr">226 </span><span class="Delimiter">}</span>
@@ -347,7 +347,7 @@ if ('onhashchange' in window) {
 <span id="L283" class="LineNr">283 </span><span class="Comment">//:</span>
 <span id="L284" class="LineNr">284 </span>
 <span id="L285" class="LineNr">285 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L286" class="LineNr">286 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;set SF if rm32 &gt; r32&quot;</span><span class="Delimiter">);</span>
+<span id="L286" class="LineNr">286 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;set SF if rm32 &gt; r32&quot;</span><span class="Delimiter">);</span>
 <span id="L287" class="LineNr">287 </span>
 <span id="L288" class="LineNr">288 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_greater)</span>
 <span id="L289" class="LineNr">289 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
@@ -364,17 +364,17 @@ if ('onhashchange' in window) {
 <span id="L300" class="LineNr">300 </span>
 <span id="L301" class="LineNr">301 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L302" class="LineNr">302 </span><span class="Normal">case</span> <span class="Constant">0x3b</span>: <span class="Delimiter">{</span>  <span class="Comment">// set SF if r32 &lt; r/m32</span>
-<span id="L303" class="LineNr">303 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L303" class="LineNr">303 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
 <span id="L304" class="LineNr">304 </span>  <span class="Normal">uint8_t</span> reg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L305" class="LineNr">305 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L305" class="LineNr">305 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>end</a><span class="Delimiter">();</span>
 <span id="L306" class="LineNr">306 </span>  <span class="Normal">int32_t</span> arg1 = Reg[reg1]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L307" class="LineNr">307 </span>  <span class="Normal">int32_t</span>* arg2 = <a href='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L307" class="LineNr">307 </span>  <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L308" class="LineNr">308 </span>  <span class="Normal">int32_t</span> tmp1 = arg1 - *arg2<span class="Delimiter">;</span>
 <span id="L309" class="LineNr">309 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L310" class="LineNr">310 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L311" class="LineNr">311 </span>  <span class="Normal">int64_t</span> tmp2 = arg1 - *arg2<span class="Delimiter">;</span>
 <span id="L312" class="LineNr">312 </span>  <a href='010vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L313" class="LineNr">313 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L313" class="LineNr">313 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L314" class="LineNr">314 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L315" class="LineNr">315 </span><span class="Delimiter">}</span>
 <span id="L316" class="LineNr">316 </span>
@@ -420,7 +420,7 @@ if ('onhashchange' in window) {
 <span id="L356" class="LineNr">356 </span><span class="Comment">//:</span>
 <span id="L357" class="LineNr">357 </span>
 <span id="L358" class="LineNr">358 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L359" class="LineNr">359 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy rm32 to r32&quot;</span><span class="Delimiter">);</span>
+<span id="L359" class="LineNr">359 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy rm32 to r32&quot;</span><span class="Delimiter">);</span>
 <span id="L360" class="LineNr">360 </span>
 <span id="L361" class="LineNr">361 </span><span class="Delimiter">:(scenario copy_mem_at_r32_to_r32)</span>
 <span id="L362" class="LineNr">362 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
@@ -436,19 +436,19 @@ if ('onhashchange' in window) {
 <span id="L372" class="LineNr">372 </span>
 <span id="L373" class="LineNr">373 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L374" class="LineNr">374 </span><span class="Normal">case</span> <span class="Constant">0x8b</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r32 to r/m32</span>
-<span id="L375" class="LineNr">375 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L375" class="LineNr">375 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
 <span id="L376" class="LineNr">376 </span>  <span class="Normal">uint8_t</span> reg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L377" class="LineNr">377 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L378" class="LineNr">378 </span>  <span class="Normal">int32_t</span>* arg2 = <a href='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L377" class="LineNr">377 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L378" class="LineNr">378 </span>  <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L379" class="LineNr">379 </span>  Reg[reg1]<span class="Delimiter">.</span>i = *arg2<span class="Delimiter">;</span>
-<span id="L380" class="LineNr">380 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; *arg2 &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L380" class="LineNr">380 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; *arg2 &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L381" class="LineNr">381 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L382" class="LineNr">382 </span><span class="Delimiter">}</span>
 <span id="L383" class="LineNr">383 </span>
 <span id="L384" class="LineNr">384 </span><span class="SalientComment">//:: jump</span>
 <span id="L385" class="LineNr">385 </span>
 <span id="L386" class="LineNr">386 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L387" class="LineNr">387 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump/push/call rm32 based on subop&quot;</span><span class="Delimiter">);</span>
+<span id="L387" class="LineNr">387 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump/push/call rm32 based on subop&quot;</span><span class="Delimiter">);</span>
 <span id="L388" class="LineNr">388 </span>
 <span id="L389" class="LineNr">389 </span><span class="Delimiter">:(scenario jump_mem_at_r32)</span>
 <span id="L390" class="LineNr">390 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
@@ -469,14 +469,14 @@ if ('onhashchange' in window) {
 <span id="L405" class="LineNr">405 </span>
 <span id="L406" class="LineNr">406 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L407" class="LineNr">407 </span><span class="Normal">case</span> <span class="Constant">0xff</span>: <span class="Delimiter">{</span>
-<span id="L408" class="LineNr">408 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L408" class="LineNr">408 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
 <span id="L409" class="LineNr">409 </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="L410" class="LineNr">410 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L411" class="LineNr">411 </span>    <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump to r/m32</span>
-<span id="L412" class="LineNr">412 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L413" class="LineNr">413 </span>      <span class="Normal">int32_t</span>* arg2 = <a href='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L412" class="LineNr">412 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L413" class="LineNr">413 </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="L414" class="LineNr">414 </span>      <a href='010vm.cc.html#L29'>EIP</a> = *arg2<span class="Delimiter">;</span>
-<span id="L415" class="LineNr">415 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; <a href='010vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L415" class="LineNr">415 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; <a href='010vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L416" class="LineNr">416 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L417" class="LineNr">417 </span>    <span class="Delimiter">}</span>
 <span id="L418" class="LineNr">418 </span>    <span class="Comment">// End Op ff Subops</span>
@@ -495,23 +495,23 @@ if ('onhashchange' in window) {
 <span id="L431" class="LineNr">431 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (push r/m32) 000 (src EAX)</span>
 <span id="L432" class="LineNr">432 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
 <span id="L433" class="LineNr">433 </span>af <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0xaf</span>
-<span id="L434" class="LineNr">434 </span><span class="traceContains">+run: <a href='012direct_addressing.cc.html#L344'>push</a> r/m32</span>
+<span id="L434" class="LineNr">434 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L371'>push</a> r/m32</span>
 <span id="L435" class="LineNr">435 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
 <span id="L436" class="LineNr">436 </span><span class="traceContains">+run: decrementing <a href='010vm.cc.html#L17'>ESP</a> to 0x00000010</span>
 <span id="L437" class="LineNr">437 </span><span class="traceContains">+run: pushing value 0x000000af</span>
 <span id="L438" class="LineNr">438 </span>
 <span id="L439" class="LineNr">439 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
 <span id="L440" class="LineNr">440 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>  <span class="Comment">// push r/m32 to stack</span>
-<span id="L441" class="LineNr">441 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L442" class="LineNr">442 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* val = <a href='012direct_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='012direct_addressing.cc.html#L344'>push</a><span class="Delimiter">(</span>*val<span class="Delimiter">);</span>
+<span id="L441" class="LineNr">441 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L442" class="LineNr">442 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* val = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L443" class="LineNr">443 </span>  <a href='013direct_addressing.cc.html#L371'>push</a><span class="Delimiter">(</span>*val<span class="Delimiter">);</span>
 <span id="L444" class="LineNr">444 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L445" class="LineNr">445 </span><span class="Delimiter">}</span>
 <span id="L446" class="LineNr">446 </span>
 <span id="L447" class="LineNr">447 </span><span class="SalientComment">//:: pop</span>
 <span id="L448" class="LineNr">448 </span>
 <span id="L449" class="LineNr">449 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L450" class="LineNr">450 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L450" class="LineNr">450 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to rm32&quot;</span><span class="Delimiter">);</span>
 <span id="L451" class="LineNr">451 </span>
 <span id="L452" class="LineNr">452 </span><span class="Delimiter">:(scenario pop_mem_at_r32)</span>
 <span id="L453" class="LineNr">453 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
@@ -522,20 +522,20 @@ if ('onhashchange' in window) {
 <span id="L458" class="LineNr">458 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (pop r/m32) 000 (dest EAX)</span>
 <span id="L459" class="LineNr">459 </span>== <span class="Constant">0x10</span>  <span class="Comment"># data segment</span>
 <span id="L460" class="LineNr">460 </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="L461" class="LineNr">461 </span><span class="traceContains">+run: <a href='012direct_addressing.cc.html#L390'>pop</a> into r/m32</span>
+<span id="L461" class="LineNr">461 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L419'>pop</a> into r/m32</span>
 <span id="L462" class="LineNr">462 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
 <span id="L463" class="LineNr">463 </span><span class="traceContains">+run: popping value 0x00000030</span>
 <span id="L464" class="LineNr">464 </span><span class="traceContains">+run: incrementing <a href='010vm.cc.html#L17'>ESP</a> to 0x00000014</span>
 <span id="L465" class="LineNr">465 </span>
 <span id="L466" class="LineNr">466 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L467" class="LineNr">467 </span><span class="Normal">case</span> <span class="Constant">0x8f</span>: <span class="Delimiter">{</span>  <span class="Comment">// pop stack into r/m32</span>
-<span id="L468" class="LineNr">468 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L468" class="LineNr">468 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
 <span id="L469" class="LineNr">469 </span>  <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
 <span id="L470" class="LineNr">470 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L471" class="LineNr">471 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>
-<span id="L472" class="LineNr">472 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L473" class="LineNr">473 </span>      <span class="Normal">int32_t</span>* dest = <a href='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L474" class="LineNr">474 </span>      *dest = <a href='012direct_addressing.cc.html#L390'>pop</a><span class="Delimiter">();</span>
+<span id="L472" class="LineNr">472 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L473" class="LineNr">473 </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="L474" class="LineNr">474 </span>      *dest = <a href='013direct_addressing.cc.html#L419'>pop</a><span class="Delimiter">();</span>
 <span id="L475" class="LineNr">475 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L476" class="LineNr">476 </span>    <span class="Delimiter">}</span>
 <span id="L477" class="LineNr">477 </span>  <span class="Delimiter">}</span>
@@ -559,7 +559,7 @@ if ('onhashchange' in window) {
 <span id="L495" class="LineNr">495 </span><span class="Delimiter">:(before &quot;End Mod 0 Special-cases(addr)&quot;)</span>
 <span id="L496" class="LineNr">496 </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="L497" class="LineNr">497 </span>  addr = <a href='011run.cc.html#L253'>imm32</a><span class="Delimiter">();</span>
-<span id="L498" class="LineNr">498 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L498" class="LineNr">498 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>end</a><span class="Delimiter">();</span>
 <span id="L499" class="LineNr">499 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L500" class="LineNr">500 </span>
 <span id="L501" class="LineNr">501 </span><span class="Comment">//:</span>
@@ -583,13 +583,13 @@ if ('onhashchange' in window) {
 <span id="L519" class="LineNr">519 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L520" class="LineNr">520 </span>  <span class="Normal">default</span>:
 <span id="L521" class="LineNr">521 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L522" class="LineNr">522 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L522" class="LineNr">522 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>end</a><span class="Delimiter">();</span>
 <span id="L523" class="LineNr">523 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L524" class="LineNr">524 </span>  <span class="Comment">// End Mod 1 Special-cases(addr)</span>
 <span id="L525" class="LineNr">525 </span>  <span class="Delimiter">}</span>
 <span id="L526" class="LineNr">526 </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="L527" class="LineNr">527 </span>    addr += <span class="Normal">static_cast</span>&lt;<span class="Normal">int8_t</span>&gt;<span class="Delimiter">(</span><a href='010vm.cc.html#L190'>next</a><span class="Delimiter">());</span>
-<span id="L528" class="LineNr">528 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp8)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L527" class="LineNr">527 </span>    addr += <span class="Normal">static_cast</span>&lt;<span class="Normal">int8_t</span>&gt;<span class="Delimiter">(</span><a href='010vm.cc.html#L193'>next</a><span class="Delimiter">());</span>
+<span id="L528" class="LineNr">528 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp8)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L529" class="LineNr">529 </span>  <span class="Delimiter">}</span>
 <span id="L530" class="LineNr">530 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L531" class="LineNr">531 </span>
@@ -628,13 +628,13 @@ if ('onhashchange' in window) {
 <span id="L564" class="LineNr">564 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L565" class="LineNr">565 </span>  <span class="Normal">default</span>:
 <span id="L566" class="LineNr">566 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L567" class="LineNr">567 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L567" class="LineNr">567 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>end</a><span class="Delimiter">();</span>
 <span id="L568" class="LineNr">568 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L569" class="LineNr">569 </span>  <span class="Comment">// End Mod 2 Special-cases(addr)</span>
 <span id="L570" class="LineNr">570 </span>  <span class="Delimiter">}</span>
 <span id="L571" class="LineNr">571 </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="L572" class="LineNr">572 </span>    addr += <a href='011run.cc.html#L253'>imm32</a><span class="Delimiter">();</span>
-<span id="L573" class="LineNr">573 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L573" class="LineNr">573 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>end</a><span class="Delimiter">();</span>
 <span id="L574" class="LineNr">574 </span>  <span class="Delimiter">}</span>
 <span id="L575" class="LineNr">575 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L576" class="LineNr">576 </span>
diff --git a/html/subx/014immediate_addressing.cc.html b/html/subx/015immediate_addressing.cc.html
index e4119c28..c4f63bd9 100644
--- a/html/subx/014immediate_addressing.cc.html
+++ b/html/subx/015immediate_addressing.cc.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/014immediate_addressing.cc</title>
+<title>Mu - subx/015immediate_addressing.cc</title>
 <meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
@@ -17,6 +17,7 @@ a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
+.CommentedCode { color: #6c6c6c; }
 .SalientComment { color: #00ffff; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
@@ -64,7 +65,7 @@ if ('onhashchange' in window) {
 <span id="L1" class="LineNr">  1 </span><span class="Comment">//: instructions that (immediately) contain an argument to act with</span>
 <span id="L2" class="LineNr">  2 </span>
 <span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;combine rm32 with <a href='011run.cc.html#L253'>imm32</a> based on subop&quot;</span><span class="Delimiter">);</span>
+<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;combine rm32 with <a href='011run.cc.html#L253'>imm32</a> based on subop&quot;</span><span class="Delimiter">);</span>
 <span id="L5" class="LineNr">  5 </span>
 <span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(scenario add_imm32_to_r32)</span>
 <span id="L7" class="LineNr">  7 </span><span class="Special">% Reg[EBX].i = 1;</span>
@@ -79,19 +80,19 @@ 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">0x81</span>: <span class="Delimiter">{</span>  <span class="Comment">// combine imm32 with r/m32</span>
-<span id="L19" class="LineNr"> 19 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L19" class="LineNr"> 19 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L253'>imm32</a><span class="Delimiter">();</span>
-<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;combine <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;combine <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>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>  <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Normal">case</span> <span class="Constant">0</span>:
-<span id="L26" class="LineNr"> 26 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop add&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L26" class="LineNr"> 26 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop add&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L27" class="LineNr"> 27 </span>    <a href='010vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L28" class="LineNr"> 28 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L29" class="LineNr"> 29 </span>  <span class="Comment">// End Op 81 Subops</span>
 <span id="L30" class="LineNr"> 30 </span>  <span class="Normal">default</span>:
-<span id="L31" class="LineNr"> 31 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after 81: &quot;</span> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L31" class="LineNr"> 31 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after 81: &quot;</span> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L32" class="LineNr"> 32 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L33" class="LineNr"> 33 </span>  <span class="Delimiter">}</span>
 <span id="L34" class="LineNr"> 34 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -115,7 +116,7 @@ if ('onhashchange' in window) {
 <span id="L52" class="LineNr"> 52 </span><span class="SalientComment">//:: subtract</span>
 <span id="L53" class="LineNr"> 53 </span>
 <span id="L54" class="LineNr"> 54 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L55" class="LineNr"> 55 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract <a href='011run.cc.html#L253'>imm32</a> from R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract <a href='011run.cc.html#L253'>imm32</a> from R0 (EAX)&quot;</span><span class="Delimiter">);</span>
 <span id="L56" class="LineNr"> 56 </span>
 <span id="L57" class="LineNr"> 57 </span><span class="Delimiter">:(scenario subtract_imm32_from_eax)</span>
 <span id="L58" class="LineNr"> 58 </span><span class="Special">% Reg[EAX].i = 0x0d0c0baa;</span>
@@ -128,7 +129,7 @@ if ('onhashchange' in window) {
 <span id="L65" class="LineNr"> 65 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L66" class="LineNr"> 66 </span><span class="Normal">case</span> <span class="Constant">0x2d</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract imm32 from EAX</span>
 <span id="L67" class="LineNr"> 67 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L253'>imm32</a><span class="Delimiter">();</span>
-<span id="L68" class="LineNr"> 68 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L68" class="LineNr"> 68 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L69" class="LineNr"> 69 </span>  <a href='010vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L70" class="LineNr"> 70 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L71" class="LineNr"> 71 </span><span class="Delimiter">}</span>
@@ -150,7 +151,7 @@ if ('onhashchange' in window) {
 <span id="L87" class="LineNr"> 87 </span>
 <span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L89" class="LineNr"> 89 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>
-<span id="L90" class="LineNr"> 90 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop subtract&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L90" class="LineNr"> 90 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop subtract&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L91" class="LineNr"> 91 </span>  <a href='010vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L93" class="LineNr"> 93 </span><span class="Delimiter">}</span>
@@ -171,7 +172,7 @@ if ('onhashchange' in window) {
 <span id="L108" class="LineNr">108 </span><span class="SalientComment">//:: and</span>
 <span id="L109" class="LineNr">109 </span>
 <span id="L110" class="LineNr">110 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L111" class="LineNr">111 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise AND of <a href='011run.cc.html#L253'>imm32</a> with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L111" class="LineNr">111 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise AND of <a href='011run.cc.html#L253'>imm32</a> with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
 <span id="L112" class="LineNr">112 </span>
 <span id="L113" class="LineNr">113 </span><span class="Delimiter">:(scenario and_imm32_with_eax)</span>
 <span id="L114" class="LineNr">114 </span><span class="Special">% Reg[EAX].i = 0xff;</span>
@@ -184,7 +185,7 @@ if ('onhashchange' in window) {
 <span id="L121" class="LineNr">121 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L122" class="LineNr">122 </span><span class="Normal">case</span> <span class="Constant">0x25</span>: <span class="Delimiter">{</span>  <span class="Comment">// and imm32 with EAX</span>
 <span id="L123" class="LineNr">123 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L253'>imm32</a><span class="Delimiter">();</span>
-<span id="L124" class="LineNr">124 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L124" class="LineNr">124 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L125" class="LineNr">125 </span>  <a href='010vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L126" class="LineNr">126 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L127" class="LineNr">127 </span><span class="Delimiter">}</span>
@@ -206,7 +207,7 @@ if ('onhashchange' in window) {
 <span id="L143" class="LineNr">143 </span>
 <span id="L144" class="LineNr">144 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L145" class="LineNr">145 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>
-<span id="L146" class="LineNr">146 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop and&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L146" class="LineNr">146 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop and&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L147" class="LineNr">147 </span>  <a href='010vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L148" class="LineNr">148 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L149" class="LineNr">149 </span><span class="Delimiter">}</span>
@@ -227,7 +228,7 @@ if ('onhashchange' in window) {
 <span id="L164" class="LineNr">164 </span><span class="SalientComment">//:: or</span>
 <span id="L165" class="LineNr">165 </span>
 <span id="L166" class="LineNr">166 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L167" class="LineNr">167 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise OR of <a href='011run.cc.html#L253'>imm32</a> with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L167" class="LineNr">167 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise OR of <a href='011run.cc.html#L253'>imm32</a> with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
 <span id="L168" class="LineNr">168 </span>
 <span id="L169" class="LineNr">169 </span><span class="Delimiter">:(scenario or_imm32_with_eax)</span>
 <span id="L170" class="LineNr">170 </span><span class="Special">% Reg[EAX].i = 0xd0c0b0a0;</span>
@@ -240,7 +241,7 @@ if ('onhashchange' in window) {
 <span id="L177" class="LineNr">177 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L178" class="LineNr">178 </span><span class="Normal">case</span> <span class="Constant">0x0d</span>: <span class="Delimiter">{</span>  <span class="Comment">// or imm32 with EAX</span>
 <span id="L179" class="LineNr">179 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L253'>imm32</a><span class="Delimiter">();</span>
-<span id="L180" class="LineNr">180 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L180" class="LineNr">180 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L181" class="LineNr">181 </span>  <a href='010vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L182" class="LineNr">182 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span>
@@ -262,7 +263,7 @@ if ('onhashchange' in window) {
 <span id="L199" class="LineNr">199 </span>
 <span id="L200" class="LineNr">200 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L201" class="LineNr">201 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>
-<span id="L202" class="LineNr">202 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop or&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L202" class="LineNr">202 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop or&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L203" class="LineNr">203 </span>  <a href='010vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L204" class="LineNr">204 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L205" class="LineNr">205 </span><span class="Delimiter">}</span>
@@ -281,7 +282,7 @@ if ('onhashchange' in window) {
 <span id="L218" class="LineNr">218 </span><span class="SalientComment">//:: xor</span>
 <span id="L219" class="LineNr">219 </span>
 <span id="L220" class="LineNr">220 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L221" class="LineNr">221 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise XOR of <a href='011run.cc.html#L253'>imm32</a> with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L221" class="LineNr">221 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise XOR of <a href='011run.cc.html#L253'>imm32</a> with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
 <span id="L222" class="LineNr">222 </span>
 <span id="L223" class="LineNr">223 </span><span class="Delimiter">:(scenario xor_imm32_with_eax)</span>
 <span id="L224" class="LineNr">224 </span><span class="Special">% Reg[EAX].i = 0xddccb0a0;</span>
@@ -294,7 +295,7 @@ if ('onhashchange' in window) {
 <span id="L231" class="LineNr">231 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L232" class="LineNr">232 </span><span class="Normal">case</span> <span class="Constant">0x35</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor imm32 with EAX</span>
 <span id="L233" class="LineNr">233 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L253'>imm32</a><span class="Delimiter">();</span>
-<span id="L234" class="LineNr">234 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L234" class="LineNr">234 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L235" class="LineNr">235 </span>  <a href='010vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L236" class="LineNr">236 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L237" class="LineNr">237 </span><span class="Delimiter">}</span>
@@ -316,7 +317,7 @@ if ('onhashchange' in window) {
 <span id="L253" class="LineNr">253 </span>
 <span id="L254" class="LineNr">254 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L255" class="LineNr">255 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>
-<span id="L256" class="LineNr">256 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop xor&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L256" class="LineNr">256 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop xor&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L257" class="LineNr">257 </span>  <a href='010vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L258" class="LineNr">258 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L259" class="LineNr">259 </span><span class="Delimiter">}</span>
@@ -335,7 +336,7 @@ if ('onhashchange' in window) {
 <span id="L272" class="LineNr">272 </span><span class="SalientComment">//:: compare (cmp)</span>
 <span id="L273" class="LineNr">273 </span>
 <span id="L274" class="LineNr">274 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L275" class="LineNr">275 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract <a href='011run.cc.html#L253'>imm32</a> from R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L275" class="LineNr">275 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract <a href='011run.cc.html#L253'>imm32</a> from R0 (EAX)&quot;</span><span class="Delimiter">);</span>
 <span id="L276" class="LineNr">276 </span>
 <span id="L277" class="LineNr">277 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_greater)</span>
 <span id="L278" class="LineNr">278 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b0a;</span>
@@ -349,13 +350,13 @@ if ('onhashchange' in window) {
 <span id="L286" class="LineNr">286 </span><span class="Normal">case</span> <span class="Constant">0x3d</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract imm32 from EAX</span>
 <span id="L287" class="LineNr">287 </span>  <span class="Normal">int32_t</span> arg1 = Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
 <span id="L288" class="LineNr">288 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L253'>imm32</a><span class="Delimiter">();</span>
-<span id="L289" class="LineNr">289 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L13'>EAX</a> and <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L289" class="LineNr">289 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L13'>EAX</a> and <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L290" class="LineNr">290 </span>  <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span>
 <span id="L291" class="LineNr">291 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L292" class="LineNr">292 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L293" class="LineNr">293 </span>  <span class="Normal">int64_t</span> tmp2 = arg1 - arg2<span class="Delimiter">;</span>
 <span id="L294" class="LineNr">294 </span>  <a href='010vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L295" class="LineNr">295 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L295" class="LineNr">295 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L296" class="LineNr">296 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L297" class="LineNr">297 </span><span class="Delimiter">}</span>
 <span id="L298" class="LineNr">298 </span>
@@ -389,13 +390,13 @@ if ('onhashchange' in window) {
 <span id="L326" class="LineNr">326 </span>
 <span id="L327" class="LineNr">327 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L328" class="LineNr">328 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>
-<span id="L329" class="LineNr">329 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop compare&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L329" class="LineNr">329 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop compare&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L330" class="LineNr">330 </span>  <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
 <span id="L331" class="LineNr">331 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L332" class="LineNr">332 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L333" class="LineNr">333 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
 <span id="L334" class="LineNr">334 </span>  <a href='010vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L335" class="LineNr">335 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L335" class="LineNr">335 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L336" class="LineNr">336 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L337" class="LineNr">337 </span><span class="Delimiter">}</span>
 <span id="L338" class="LineNr">338 </span>
@@ -459,14 +460,14 @@ if ('onhashchange' in window) {
 <span id="L396" class="LineNr">396 </span><span class="SalientComment">//:: copy (mov)</span>
 <span id="L397" class="LineNr">397 </span>
 <span id="L398" class="LineNr">398 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L399" class="LineNr">399 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L400" class="LineNr">400 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to R1 (ECX)&quot;</span><span class="Delimiter">);</span>
-<span id="L401" class="LineNr">401 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to R2 (EDX)&quot;</span><span class="Delimiter">);</span>
-<span id="L402" class="LineNr">402 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to R3 (EBX)&quot;</span><span class="Delimiter">);</span>
-<span id="L403" class="LineNr">403 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to R4 (ESP)&quot;</span><span class="Delimiter">);</span>
-<span id="L404" class="LineNr">404 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to R5 (EBP)&quot;</span><span class="Delimiter">);</span>
-<span id="L405" class="LineNr">405 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to R6 (ESI)&quot;</span><span class="Delimiter">);</span>
-<span id="L406" class="LineNr">406 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to R7 (EDI)&quot;</span><span class="Delimiter">);</span>
+<span id="L399" class="LineNr">399 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L400" class="LineNr">400 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to R1 (ECX)&quot;</span><span class="Delimiter">);</span>
+<span id="L401" class="LineNr">401 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to R2 (EDX)&quot;</span><span class="Delimiter">);</span>
+<span id="L402" class="LineNr">402 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to R3 (EBX)&quot;</span><span class="Delimiter">);</span>
+<span id="L403" class="LineNr">403 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to R4 (ESP)&quot;</span><span class="Delimiter">);</span>
+<span id="L404" class="LineNr">404 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to R5 (EBP)&quot;</span><span class="Delimiter">);</span>
+<span id="L405" class="LineNr">405 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to R6 (ESI)&quot;</span><span class="Delimiter">);</span>
+<span id="L406" class="LineNr">406 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to R7 (EDI)&quot;</span><span class="Delimiter">);</span>
 <span id="L407" class="LineNr">407 </span>
 <span id="L408" class="LineNr">408 </span><span class="Delimiter">:(scenario copy_imm32_to_r32)</span>
 <span id="L409" class="LineNr">409 </span>== <span class="Constant">0x1</span>
@@ -485,7 +486,7 @@ if ('onhashchange' in window) {
 <span id="L422" class="LineNr">422 </span><span class="Normal">case</span> <span class="Constant">0xbf</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
 <span id="L423" class="LineNr">423 </span>  <span class="Normal">uint8_t</span> reg1 = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
 <span id="L424" class="LineNr">424 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L253'>imm32</a><span class="Delimiter">();</span>
-<span id="L425" class="LineNr">425 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='012direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L425" class="LineNr">425 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>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#L215'>end</a><span class="Delimiter">();</span>
 <span id="L426" class="LineNr">426 </span>  Reg[reg1]<span class="Delimiter">.</span>i = arg2<span class="Delimiter">;</span>
 <span id="L427" class="LineNr">427 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L428" class="LineNr">428 </span><span class="Delimiter">}</span>
@@ -493,7 +494,7 @@ if ('onhashchange' in window) {
 <span id="L430" class="LineNr">430 </span><span class="Comment">//:</span>
 <span id="L431" class="LineNr">431 </span>
 <span id="L432" class="LineNr">432 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L433" class="LineNr">433 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L433" class="LineNr">433 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> to rm32&quot;</span><span class="Delimiter">);</span>
 <span id="L434" class="LineNr">434 </span>
 <span id="L435" class="LineNr">435 </span><span class="Delimiter">:(scenario copy_imm32_to_mem_at_r32)</span>
 <span id="L436" class="LineNr">436 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
@@ -506,10 +507,10 @@ if ('onhashchange' in window) {
 <span id="L443" class="LineNr">443 </span>
 <span id="L444" class="LineNr">444 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L445" class="LineNr">445 </span><span class="Normal">case</span> <span class="Constant">0xc7</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
-<span id="L446" class="LineNr">446 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L446" class="LineNr">446 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
 <span id="L447" class="LineNr">447 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L253'>imm32</a><span class="Delimiter">();</span>
-<span id="L448" class="LineNr">448 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L449" class="LineNr">449 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L448" class="LineNr">448 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L449" class="LineNr">449 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L450" class="LineNr">450 </span>  *arg1 = arg2<span class="Delimiter">;</span>
 <span id="L451" class="LineNr">451 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L452" class="LineNr">452 </span><span class="Delimiter">}</span>
@@ -517,25 +518,25 @@ if ('onhashchange' in window) {
 <span id="L454" class="LineNr">454 </span><span class="SalientComment">//:: push</span>
 <span id="L455" class="LineNr">455 </span>
 <span id="L456" class="LineNr">456 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L457" class="LineNr">457 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='011run.cc.html#L253'>imm32</a> to stack&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='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='011run.cc.html#L253'>imm32</a> to stack&quot;</span><span class="Delimiter">);</span>
 <span id="L458" class="LineNr">458 </span>
 <span id="L459" class="LineNr">459 </span><span class="Delimiter">:(scenario push_imm32)</span>
 <span id="L460" class="LineNr">460 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
 <span id="L461" class="LineNr">461 </span>== <span class="Constant">0x1</span>
 <span id="L462" class="LineNr">462 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L463" class="LineNr">463 </span>  <span class="Constant">68</span>                              af <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># push *EAX to stack</span>
-<span id="L464" class="LineNr">464 </span><span class="traceContains">+run: <a href='012direct_addressing.cc.html#L344'>push</a> <a href='011run.cc.html#L253'>imm32</a> 0x000000af</span>
+<span id="L464" class="LineNr">464 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L371'>push</a> <a href='011run.cc.html#L253'>imm32</a> 0x000000af</span>
 <span id="L465" class="LineNr">465 </span><span class="traceContains">+run: <a href='010vm.cc.html#L17'>ESP</a> is now 0x00000010</span>
 <span id="L466" class="LineNr">466 </span><span class="traceContains">+run: <a href='003trace.cc.html#L74'>contents</a> at <a href='010vm.cc.html#L17'>ESP</a>: 0x000000af</span>
 <span id="L467" class="LineNr">467 </span>
 <span id="L468" class="LineNr">468 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L469" class="LineNr">469 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span>
-<span id="L470" class="LineNr">470 </span>  <span class="Normal">int32_t</span> val = <a href='011run.cc.html#L253'>imm32</a><span class="Delimiter">();</span>
-<span id="L471" class="LineNr">471 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L472" class="LineNr">472 </span>  Reg[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L473" class="LineNr">473 </span>  <a href='010vm.cc.html#L139'>write_mem_i32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
-<span id="L474" class="LineNr">474 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ESP is now 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L475" class="LineNr">475 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;contents at <a href='010vm.cc.html#L17'>ESP</a>: 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; <a href='010vm.cc.html#L110'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L470" class="LineNr">470 </span>  <span class="Normal">uint32_t</span> val = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L253'>imm32</a><span class="Delimiter">());</span>
+<span id="L471" class="LineNr">471 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L472" class="LineNr">472 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: &quot; &lt;&lt; val &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
+<span id="L473" class="LineNr">473 </span>  <a href='013direct_addressing.cc.html#L371'>push</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
+<span id="L474" class="LineNr">474 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ESP is now 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L475" class="LineNr">475 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;contents at <a href='010vm.cc.html#L17'>ESP</a>: 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; <a href='010vm.cc.html#L110'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L476" class="LineNr">476 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L477" class="LineNr">477 </span><span class="Delimiter">}</span>
 </pre>
diff --git a/html/subx/015jump_relative.cc.html b/html/subx/015jump_relative.cc.html
deleted file mode 100644
index af4609c4..00000000
--- a/html/subx/015jump_relative.cc.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<!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/015jump_relative.cc</title>
-<meta name="Generator" content="Vim/7.4">
-<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; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.traceContains { color: #008000; }
-.traceAbsent { color: #c00000; }
--->
-</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">//: jump to 8-bit offset</span>
-<span id="L2" class="LineNr">  2 </span>
-<span id="L3" class="LineNr">  3 </span><span class="SalientComment">//:: jump</span>
-<span id="L4" class="LineNr">  4 </span>
-<span id="L5" class="LineNr">  5 </span><span class="Delimiter">:(scenario jump_rel8)</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L7" class="LineNr">  7 </span>  eb                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L8" class="LineNr">  8 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L9" class="LineNr">  9 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L10" class="LineNr"> 10 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L11" class="LineNr"> 11 </span><span class="traceContains">+run: jump 5</span>
-<span id="L12" class="LineNr"> 12 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L13" class="LineNr"> 13 </span><span class="traceAbsent">-run: inst: 0x00000003</span>
-<span id="L14" class="LineNr"> 14 </span>
-<span id="L15" class="LineNr"> 15 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L16" class="LineNr"> 16 </span><span class="Normal">case</span> <span class="Constant">0xeb</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8</span>
-<span id="L17" class="LineNr"> 17 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">());</span>
-<span id="L18" class="LineNr"> 18 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L246'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L19" class="LineNr"> 19 </span>  <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L20" class="LineNr"> 20 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Delimiter">}</span>
-<span id="L22" class="LineNr"> 22 </span>
-<span id="L23" class="LineNr"> 23 </span><span class="SalientComment">//:: jump if equal/zero</span>
-<span id="L24" class="LineNr"> 24 </span>
-<span id="L25" class="LineNr"> 25 </span><span class="Delimiter">:(scenario je_rel8_success)</span>
-<span id="L26" class="LineNr"> 26 </span><span class="Special">% ZF = true;</span>
-<span id="L27" class="LineNr"> 27 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L28" class="LineNr"> 28 </span>  <span class="Constant">74</span>                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L29" class="LineNr"> 29 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L30" class="LineNr"> 30 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L31" class="LineNr"> 31 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L32" class="LineNr"> 32 </span><span class="traceContains">+run: jump 5</span>
-<span id="L33" class="LineNr"> 33 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L34" class="LineNr"> 34 </span><span class="traceAbsent">-run: inst: 0x00000003</span>
-<span id="L35" class="LineNr"> 35 </span>
-<span id="L36" class="LineNr"> 36 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L37" class="LineNr"> 37 </span><span class="Normal">case</span> <span class="Constant">0x74</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if ZF</span>
-<span id="L38" class="LineNr"> 38 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">());</span>
-<span id="L39" class="LineNr"> 39 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L246'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L41" class="LineNr"> 41 </span>    <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L42" class="LineNr"> 42 </span>  <span class="Delimiter">}</span>
-<span id="L43" class="LineNr"> 43 </span>  <span class="Identifier">break</span><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><span class="Delimiter">:(scenario je_rel8_fail)</span>
-<span id="L47" class="LineNr"> 47 </span><span class="Special">% ZF = false;</span>
-<span id="L48" class="LineNr"> 48 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L49" class="LineNr"> 49 </span>  <span class="Constant">74</span>                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L50" class="LineNr"> 50 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L51" class="LineNr"> 51 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L52" class="LineNr"> 52 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L53" class="LineNr"> 53 </span><span class="traceContains">+run: inst: 0x00000003</span>
-<span id="L54" class="LineNr"> 54 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L55" class="LineNr"> 55 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L56" class="LineNr"> 56 </span>
-<span id="L57" class="LineNr"> 57 </span><span class="SalientComment">//:: jump if not equal/not zero</span>
-<span id="L58" class="LineNr"> 58 </span>
-<span id="L59" class="LineNr"> 59 </span><span class="Delimiter">:(scenario jne_rel8_success)</span>
-<span id="L60" class="LineNr"> 60 </span><span class="Special">% ZF = false;</span>
-<span id="L61" class="LineNr"> 61 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L62" class="LineNr"> 62 </span>  <span class="Constant">75</span>                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L63" class="LineNr"> 63 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L64" class="LineNr"> 64 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L65" class="LineNr"> 65 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L66" class="LineNr"> 66 </span><span class="traceContains">+run: jump 5</span>
-<span id="L67" class="LineNr"> 67 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L68" class="LineNr"> 68 </span><span class="traceAbsent">-run: inst: 0x00000003</span>
-<span id="L69" class="LineNr"> 69 </span>
-<span id="L70" class="LineNr"> 70 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L71" class="LineNr"> 71 </span><span class="Normal">case</span> <span class="Constant">0x75</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 unless ZF</span>
-<span id="L72" class="LineNr"> 72 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">());</span>
-<span id="L73" class="LineNr"> 73 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L74" class="LineNr"> 74 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L246'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L75" class="LineNr"> 75 </span>    <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L76" class="LineNr"> 76 </span>  <span class="Delimiter">}</span>
-<span id="L77" class="LineNr"> 77 </span>  <span class="Identifier">break</span><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><span class="Delimiter">:(scenario jne_rel8_fail)</span>
-<span id="L81" class="LineNr"> 81 </span><span class="Special">% ZF = true;</span>
-<span id="L82" class="LineNr"> 82 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Constant">75</span>                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L84" class="LineNr"> 84 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L86" class="LineNr"> 86 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L87" class="LineNr"> 87 </span><span class="traceContains">+run: inst: 0x00000003</span>
-<span id="L88" class="LineNr"> 88 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L89" class="LineNr"> 89 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L90" class="LineNr"> 90 </span>
-<span id="L91" class="LineNr"> 91 </span><span class="SalientComment">//:: jump if greater</span>
-<span id="L92" class="LineNr"> 92 </span>
-<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(scenario jg_rel8_success)</span>
-<span id="L94" class="LineNr"> 94 </span><span class="Special">% ZF = false;</span>
-<span id="L95" class="LineNr"> 95 </span><span class="Special">% SF = false;</span>
-<span id="L96" class="LineNr"> 96 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L97" class="LineNr"> 97 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="Constant">7f</span>                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L99" class="LineNr"> 99 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L100" class="LineNr">100 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L101" class="LineNr">101 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L102" class="LineNr">102 </span><span class="traceContains">+run: jump 5</span>
-<span id="L103" class="LineNr">103 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L104" class="LineNr">104 </span><span class="traceAbsent">-run: inst: 0x00000003</span>
-<span id="L105" class="LineNr">105 </span>
-<span id="L106" class="LineNr">106 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L107" class="LineNr">107 </span><span class="Normal">case</span> <span class="Constant">0x7f</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if !SF and !ZF</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">());</span>
-<span id="L109" class="LineNr">109 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF &amp;&amp; SF == <a href='010core.cc.html#L33'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L110" class="LineNr">110 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L246'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L111" class="LineNr">111 </span>    <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L112" class="LineNr">112 </span>  <span class="Delimiter">}</span>
-<span id="L113" class="LineNr">113 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L114" class="LineNr">114 </span><span class="Delimiter">}</span>
-<span id="L115" class="LineNr">115 </span>
-<span id="L116" class="LineNr">116 </span><span class="Delimiter">:(scenario jg_rel8_fail)</span>
-<span id="L117" class="LineNr">117 </span><span class="Special">% ZF = false;</span>
-<span id="L118" class="LineNr">118 </span><span class="Special">% SF = true;</span>
-<span id="L119" class="LineNr">119 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L120" class="LineNr">120 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L121" class="LineNr">121 </span>  <span class="Constant">7f</span>                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L122" class="LineNr">122 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L123" class="LineNr">123 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L124" class="LineNr">124 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L125" class="LineNr">125 </span><span class="traceContains">+run: inst: 0x00000003</span>
-<span id="L126" class="LineNr">126 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L127" class="LineNr">127 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L128" class="LineNr">128 </span>
-<span id="L129" class="LineNr">129 </span><span class="SalientComment">//:: jump if greater or equal</span>
-<span id="L130" class="LineNr">130 </span>
-<span id="L131" class="LineNr">131 </span><span class="Delimiter">:(scenario jge_rel8_success)</span>
-<span id="L132" class="LineNr">132 </span><span class="Special">% SF = false;</span>
-<span id="L133" class="LineNr">133 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L134" class="LineNr">134 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L135" class="LineNr">135 </span>  7d                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L136" class="LineNr">136 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L137" class="LineNr">137 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L138" class="LineNr">138 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L139" class="LineNr">139 </span><span class="traceContains">+run: jump 5</span>
-<span id="L140" class="LineNr">140 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L141" class="LineNr">141 </span><span class="traceAbsent">-run: inst: 0x00000003</span>
-<span id="L142" class="LineNr">142 </span>
-<span id="L143" class="LineNr">143 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L144" class="LineNr">144 </span><span class="Normal">case</span> <span class="Constant">0x7d</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if !SF</span>
-<span id="L145" class="LineNr">145 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">());</span>
-<span id="L146" class="LineNr">146 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF == <a href='010core.cc.html#L33'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L147" class="LineNr">147 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L246'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L148" class="LineNr">148 </span>    <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Delimiter">}</span>
-<span id="L150" class="LineNr">150 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L151" class="LineNr">151 </span><span class="Delimiter">}</span>
-<span id="L152" class="LineNr">152 </span>
-<span id="L153" class="LineNr">153 </span><span class="Delimiter">:(scenario jge_rel8_fail)</span>
-<span id="L154" class="LineNr">154 </span><span class="Special">% SF = true;</span>
-<span id="L155" class="LineNr">155 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L156" class="LineNr">156 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L157" class="LineNr">157 </span>  7d                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L158" class="LineNr">158 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L159" class="LineNr">159 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L160" class="LineNr">160 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L161" class="LineNr">161 </span><span class="traceContains">+run: inst: 0x00000003</span>
-<span id="L162" class="LineNr">162 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L163" class="LineNr">163 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L164" class="LineNr">164 </span>
-<span id="L165" class="LineNr">165 </span><span class="SalientComment">//:: jump if lesser</span>
-<span id="L166" class="LineNr">166 </span>
-<span id="L167" class="LineNr">167 </span><span class="Delimiter">:(scenario jl_rel8_success)</span>
-<span id="L168" class="LineNr">168 </span><span class="Special">% ZF = false;</span>
-<span id="L169" class="LineNr">169 </span><span class="Special">% SF = true;</span>
-<span id="L170" class="LineNr">170 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L171" class="LineNr">171 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L172" class="LineNr">172 </span>  7c                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L173" class="LineNr">173 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L174" class="LineNr">174 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L175" class="LineNr">175 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L176" class="LineNr">176 </span><span class="traceContains">+run: jump 5</span>
-<span id="L177" class="LineNr">177 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L178" class="LineNr">178 </span><span class="traceAbsent">-run: inst: 0x00000003</span>
-<span id="L179" class="LineNr">179 </span>
-<span id="L180" class="LineNr">180 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L181" class="LineNr">181 </span><span class="Normal">case</span> <span class="Constant">0x7c</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if SF and !ZF</span>
-<span id="L182" class="LineNr">182 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">());</span>
-<span id="L183" class="LineNr">183 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF != <a href='010core.cc.html#L33'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L184" class="LineNr">184 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L246'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L185" class="LineNr">185 </span>    <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L186" class="LineNr">186 </span>  <span class="Delimiter">}</span>
-<span id="L187" class="LineNr">187 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L188" class="LineNr">188 </span><span class="Delimiter">}</span>
-<span id="L189" class="LineNr">189 </span>
-<span id="L190" class="LineNr">190 </span><span class="Delimiter">:(scenario jl_rel8_fail)</span>
-<span id="L191" class="LineNr">191 </span><span class="Special">% ZF = false;</span>
-<span id="L192" class="LineNr">192 </span><span class="Special">% SF = false;</span>
-<span id="L193" class="LineNr">193 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L194" class="LineNr">194 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L195" class="LineNr">195 </span>  7c                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L196" class="LineNr">196 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L197" class="LineNr">197 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L198" class="LineNr">198 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L199" class="LineNr">199 </span><span class="traceContains">+run: inst: 0x00000003</span>
-<span id="L200" class="LineNr">200 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L201" class="LineNr">201 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L202" class="LineNr">202 </span>
-<span id="L203" class="LineNr">203 </span><span class="SalientComment">//:: jump if lesser or equal</span>
-<span id="L204" class="LineNr">204 </span>
-<span id="L205" class="LineNr">205 </span><span class="Delimiter">:(scenario jle_rel8_equal)</span>
-<span id="L206" class="LineNr">206 </span><span class="Special">% ZF = true;</span>
-<span id="L207" class="LineNr">207 </span><span class="Special">% SF = false;</span>
-<span id="L208" class="LineNr">208 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L209" class="LineNr">209 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L210" class="LineNr">210 </span>  7e                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L211" class="LineNr">211 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L212" class="LineNr">212 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L213" class="LineNr">213 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L214" class="LineNr">214 </span><span class="traceContains">+run: jump 5</span>
-<span id="L215" class="LineNr">215 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L216" class="LineNr">216 </span><span class="traceAbsent">-run: inst: 0x00000003</span>
-<span id="L217" class="LineNr">217 </span>
-<span id="L218" class="LineNr">218 </span><span class="Delimiter">:(scenario jle_rel8_lesser)</span>
-<span id="L219" class="LineNr">219 </span><span class="Special">% ZF = false;</span>
-<span id="L220" class="LineNr">220 </span><span class="Special">% SF = true;</span>
-<span id="L221" class="LineNr">221 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L222" class="LineNr">222 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L223" class="LineNr">223 </span>  7e                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L224" class="LineNr">224 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L225" class="LineNr">225 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L226" class="LineNr">226 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L227" class="LineNr">227 </span><span class="traceContains">+run: jump 5</span>
-<span id="L228" class="LineNr">228 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L229" class="LineNr">229 </span><span class="traceAbsent">-run: inst: 0x00000003</span>
-<span id="L230" class="LineNr">230 </span>
-<span id="L231" class="LineNr">231 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L232" class="LineNr">232 </span><span class="Normal">case</span> <span class="Constant">0x7e</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if SF or ZF</span>
-<span id="L233" class="LineNr">233 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">());</span>
-<span id="L234" class="LineNr">234 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF || SF != <a href='010core.cc.html#L33'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L235" class="LineNr">235 </span>    <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L246'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L236" class="LineNr">236 </span>    <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L237" class="LineNr">237 </span>  <span class="Delimiter">}</span>
-<span id="L238" class="LineNr">238 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L239" class="LineNr">239 </span><span class="Delimiter">}</span>
-<span id="L240" class="LineNr">240 </span>
-<span id="L241" class="LineNr">241 </span><span class="Delimiter">:(scenario jle_rel8_greater)</span>
-<span id="L242" class="LineNr">242 </span><span class="Special">% ZF = false;</span>
-<span id="L243" class="LineNr">243 </span><span class="Special">% SF = false;</span>
-<span id="L244" class="LineNr">244 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L245" class="LineNr">245 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L246" class="LineNr">246 </span>  7e                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
-<span id="L247" class="LineNr">247 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L248" class="LineNr">248 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L249" class="LineNr">249 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L250" class="LineNr">250 </span><span class="traceContains">+run: inst: 0x00000003</span>
-<span id="L251" class="LineNr">251 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L252" class="LineNr">252 </span><span class="traceAbsent">-run: jump 5</span>
-</pre>
-</body>
-</html>
-<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/015index_addressing.cc.html b/html/subx/016index_addressing.cc.html
index 2cd90f2e..1fe7ab8f 100644
--- a/html/subx/015index_addressing.cc.html
+++ b/html/subx/016index_addressing.cc.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/015index_addressing.cc</title>
+<title>Mu - subx/016index_addressing.cc</title>
 <meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
@@ -79,31 +79,31 @@ if ('onhashchange' in window) {
 <span id="L17" class="LineNr"> 17 </span>
 <span id="L18" class="LineNr"> 18 </span><span class="Delimiter">:(before &quot;End Mod 0 Special-cases(addr)&quot;)</span>
 <span id="L19" class="LineNr"> 19 </span><span class="Normal">case</span> <span class="Constant">4</span>:  <span class="Comment">// exception: mod 0b00 rm 0b100 =&gt; incoming SIB (scale-index-base) byte</span>
-<span id="L20" class="LineNr"> 20 </span>  addr = <a href='015index_addressing.cc.html#L23'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span>
+<span id="L20" class="LineNr"> 20 </span>  addr = <a href='016index_addressing.cc.html#L23'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(code)</span>
-<span id="L23" class="LineNr"> 23 </span><span class="Normal">uint32_t</span> <a href='015index_addressing.cc.html#L23'>effective_address_from_sib</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Normal">uint8_t</span> sib = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L23" class="LineNr"> 23 </span><span class="Normal">uint32_t</span> <a href='016index_addressing.cc.html#L23'>effective_address_from_sib</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="Normal">uint8_t</span> sib = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Normal">uint8_t</span> base = sib&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
 <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='010vm.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#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L29" class="LineNr"> 29 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>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#L253'>imm32</a><span class="Delimiter">();</span>  <span class="Comment">// ignore base</span>
-<span id="L34" class="LineNr"> 34 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L34" class="LineNr"> 34 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>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>
 <span id="L37" class="LineNr"> 37 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>index == <a href='010vm.cc.html#L17'>ESP</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L38" class="LineNr"> 38 </span>    <span class="Comment">// ignore index and scale</span>
-<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L40" class="LineNr"> 40 </span>  <span class="Delimiter">}</span>
 <span id="L41" class="LineNr"> 41 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L42" class="LineNr"> 42 </span>    <span class="Normal">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#L189'>trace</a><span class="Delimiter">(</span><span class="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='012direct_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='010vm.cc.html#L230'>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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L44" class="LineNr"> 44 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L241'>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#L215'>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>
@@ -159,7 +159,7 @@ if ('onhashchange' in window) {
 <span id="L97" class="LineNr"> 97 </span>
 <span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(before &quot;End Mod 1 Special-cases(addr)&quot;)</span>
 <span id="L99" class="LineNr"> 99 </span><span class="Normal">case</span> <span class="Constant">4</span>:  <span class="Comment">// exception: mod 0b01 rm 0b100 =&gt; incoming SIB (scale-index-base) byte</span>
-<span id="L100" class="LineNr">100 </span>  addr = <a href='015index_addressing.cc.html#L23'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span>
+<span id="L100" class="LineNr">100 </span>  addr = <a href='016index_addressing.cc.html#L23'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L102" class="LineNr">102 </span>
 <span id="L103" class="LineNr">103 </span><span class="Comment">//:</span>
@@ -183,7 +183,7 @@ if ('onhashchange' in window) {
 <span id="L121" class="LineNr">121 </span>
 <span id="L122" class="LineNr">122 </span><span class="Delimiter">:(before &quot;End Mod 2 Special-cases(addr)&quot;)</span>
 <span id="L123" class="LineNr">123 </span><span class="Normal">case</span> <span class="Constant">4</span>:  <span class="Comment">// exception: mod 0b10 rm 0b100 =&gt; incoming SIB (scale-index-base) byte</span>
-<span id="L124" class="LineNr">124 </span>  addr = <a href='015index_addressing.cc.html#L23'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span>
+<span id="L124" class="LineNr">124 </span>  addr = <a href='016index_addressing.cc.html#L23'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span>
 <span id="L125" class="LineNr">125 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 </pre>
 </body>
diff --git a/html/subx/017functions.cc.html b/html/subx/017functions.cc.html
deleted file mode 100644
index 80d2f34d..00000000
--- a/html/subx/017functions.cc.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!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/017functions.cc</title>
-<meta name="Generator" content="Vim/7.4">
-<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; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.SalientComment { color: #00ffff; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.PreProc { color: #800080; }
-.traceContains { color: #008000; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
--->
-</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">//:: call</span>
-<span id="L2" class="LineNr"> 2 </span>
-<span id="L3" class="LineNr"> 3 </span><span class="Delimiter">:(scenario call_imm32)</span>
-<span id="L4" class="LineNr"> 4 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L6" class="LineNr"> 6 </span>  e8                              a0 <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># call function offset at 0x000000a0</span>
-<span id="L7" class="LineNr"> 7 </span>  <span class="Comment"># next EIP is 6</span>
-<span id="L8" class="LineNr"> 8 </span><span class="traceContains">+run: call <a href='010core.cc.html#L219'>imm32</a> 0x000000a0</span>
-<span id="L9" class="LineNr"> 9 </span><span class="traceContains">+run: decrementing <a href='010core.cc.html#L11'>ESP</a> to 0x00000060</span>
-<span id="L10" class="LineNr">10 </span><span class="traceContains">+run: pushing value 0x00000006</span>
-<span id="L11" class="LineNr">11 </span><span class="traceContains">+run: jumping to 0x000000a6</span>
-<span id="L12" class="LineNr">12 </span>
-<span id="L13" class="LineNr">13 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L14" class="LineNr">14 </span><span class="Normal">case</span> <span class="Constant">0xe8</span>: <span class="Delimiter">{</span>  <span class="Comment">// call imm32 relative to next EIP</span>
-<span id="L15" class="LineNr">15 </span>  <span class="Normal">int32_t</span> offset = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L16" class="LineNr">16 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; offset &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L17" class="LineNr">17 </span>  <a href='011direct_addressing.cc.html#L283'>push</a><span class="Delimiter">(</span><a href='010core.cc.html#L23'>EIP</a><span class="Delimiter">);</span>
-<span id="L18" class="LineNr">18 </span>  <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L19" class="LineNr">19 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; <a href='010core.cc.html#L23'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L20" class="LineNr">20 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L21" class="LineNr">21 </span><span class="Delimiter">}</span>
-<span id="L22" class="LineNr">22 </span>
-<span id="L23" class="LineNr">23 </span><span class="Comment">//:</span>
-<span id="L24" class="LineNr">24 </span>
-<span id="L25" class="LineNr">25 </span><span class="Delimiter">:(scenario call_r32)</span>
-<span id="L26" class="LineNr">26 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L27" class="LineNr">27 </span><span class="Special">% Reg[EBX].u = 0x000000a0;</span>
-<span id="L28" class="LineNr">28 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L29" class="LineNr">29 </span>  ff  d3                                       <span class="Comment"># call function offset at EBX</span>
-<span id="L30" class="LineNr">30 </span>  <span class="Comment"># next EIP is 3</span>
-<span id="L31" class="LineNr">31 </span><span class="traceContains">+run: call to r/m32</span>
-<span id="L32" class="LineNr">32 </span><span class="traceContains">+run: r/m32 is <a href='010core.cc.html#L10'>EBX</a></span>
-<span id="L33" class="LineNr">33 </span><span class="traceContains">+run: decrementing <a href='010core.cc.html#L11'>ESP</a> to 0x00000060</span>
-<span id="L34" class="LineNr">34 </span><span class="traceContains">+run: pushing value 0x00000003</span>
-<span id="L35" class="LineNr">35 </span><span class="traceContains">+run: jumping to 0x000000a3</span>
-<span id="L36" class="LineNr">36 </span>
-<span id="L37" class="LineNr">37 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
-<span id="L38" class="LineNr">38 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span>  <span class="Comment">// call function pointer at r/m32</span>
-<span id="L39" class="LineNr">39 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L40" class="LineNr">40 </span>  <span class="Normal">int32_t</span>* offset = <a href='011direct_addressing.cc.html#L27'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L41" class="LineNr">41 </span>  <a href='011direct_addressing.cc.html#L283'>push</a><span class="Delimiter">(</span><a href='010core.cc.html#L23'>EIP</a><span class="Delimiter">);</span>
-<span id="L42" class="LineNr">42 </span>  <a href='010core.cc.html#L23'>EIP</a> += *offset<span class="Delimiter">;</span>
-<span id="L43" class="LineNr">43 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; <a href='010core.cc.html#L23'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L44" class="LineNr">44 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L45" class="LineNr">45 </span><span class="Delimiter">}</span>
-<span id="L46" class="LineNr">46 </span>
-<span id="L47" class="LineNr">47 </span><span class="Delimiter">:(scenario call_mem_at_r32)</span>
-<span id="L48" class="LineNr">48 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L49" class="LineNr">49 </span><span class="Special">% Reg[EBX].u = 0x10;</span>
-<span id="L50" class="LineNr">50 </span><span class="Special">% SET_WORD_IN_MEM(0x10, 0x000000a0);</span>
-<span id="L51" class="LineNr">51 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L52" class="LineNr">52 </span>  ff  <span class="Constant">13</span>                                       <span class="Comment"># call function offset at *EBX</span>
-<span id="L53" class="LineNr">53 </span>  <span class="Comment"># next EIP is 3</span>
-<span id="L54" class="LineNr">54 </span><span class="traceContains">+run: call to r/m32</span>
-<span id="L55" class="LineNr">55 </span><span class="traceContains">+run: effective address is 0x10 (EBX)</span>
-<span id="L56" class="LineNr">56 </span><span class="traceContains">+run: decrementing <a href='010core.cc.html#L11'>ESP</a> to 0x00000060</span>
-<span id="L57" class="LineNr">57 </span><span class="traceContains">+run: pushing value 0x00000003</span>
-<span id="L58" class="LineNr">58 </span><span class="traceContains">+run: jumping to 0x000000a3</span>
-<span id="L59" class="LineNr">59 </span>
-<span id="L60" class="LineNr">60 </span><span class="SalientComment">//:: ret</span>
-<span id="L61" class="LineNr">61 </span>
-<span id="L62" class="LineNr">62 </span><span class="Delimiter">:(scenario ret)</span>
-<span id="L63" class="LineNr">63 </span><span class="Special">% Reg[ESP].u = 0x60;</span>
-<span id="L64" class="LineNr">64 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x00000010);</span>
-<span id="L65" class="LineNr">65 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L66" class="LineNr">66 </span>  c3
-<span id="L67" class="LineNr">67 </span><span class="traceContains">+run: return</span>
-<span id="L68" class="LineNr">68 </span><span class="traceContains">+run: popping value 0x00000010</span>
-<span id="L69" class="LineNr">69 </span><span class="traceContains">+run: jumping to 0x00000010</span>
-<span id="L70" class="LineNr">70 </span>
-<span id="L71" class="LineNr">71 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L72" class="LineNr">72 </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="L73" class="LineNr">73 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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#L184'>end</a><span class="Delimiter">();</span>
-<span id="L74" class="LineNr">74 </span>  <a href='010core.cc.html#L23'>EIP</a> = <a href='011direct_addressing.cc.html#L316'>pop</a><span class="Delimiter">();</span>
-<span id="L75" class="LineNr">75 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</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='010core.cc.html#L244'>HEXWORD</a> &lt;&lt; <a href='010core.cc.html#L23'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L76" class="LineNr">76 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L77" class="LineNr">77 </span><span class="Delimiter">}</span>
-</pre>
-</body>
-</html>
-<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/016jump_relative.cc.html b/html/subx/017jump_disp8.cc.html
index 87507c3b..fddb1da6 100644
--- a/html/subx/016jump_relative.cc.html
+++ b/html/subx/017jump_disp8.cc.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/016jump_relative.cc</title>
+<title>Mu - subx/017jump_disp8.cc</title>
 <meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
@@ -66,7 +66,7 @@ if ('onhashchange' in window) {
 <span id="L3" class="LineNr">  3 </span><span class="SalientComment">//:: jump</span>
 <span id="L4" class="LineNr">  4 </span>
 <span id="L5" class="LineNr">  5 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L6" class="LineNr">  6 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;eb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away&quot;</span><span class="Delimiter">);</span>
+<span id="L6" class="LineNr">  6 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;eb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away&quot;</span><span class="Delimiter">);</span>
 <span id="L7" class="LineNr">  7 </span>
 <span id="L8" class="LineNr">  8 </span><span class="Delimiter">:(scenario jump_rel8)</span>
 <span id="L9" class="LineNr">  9 </span>== <span class="Constant">0x1</span>
@@ -81,8 +81,8 @@ if ('onhashchange' in window) {
 <span id="L18" class="LineNr"> 18 </span>
 <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L20" class="LineNr"> 20 </span><span class="Normal">case</span> <span class="Constant">0xeb</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010vm.cc.html#L190'>next</a><span class="Delimiter">());</span>
-<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010vm.cc.html#L193'>next</a><span class="Delimiter">());</span>
+<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L23" class="LineNr"> 23 </span>  <a href='010vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L25" class="LineNr"> 25 </span><span class="Delimiter">}</span>
@@ -90,7 +90,7 @@ if ('onhashchange' in window) {
 <span id="L27" class="LineNr"> 27 </span><span class="SalientComment">//:: jump if equal/zero</span>
 <span id="L28" class="LineNr"> 28 </span>
 <span id="L29" class="LineNr"> 29 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L30" class="LineNr"> 30 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;74&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if ZF is set&quot;</span><span class="Delimiter">);</span>
+<span id="L30" class="LineNr"> 30 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;74&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if ZF is set&quot;</span><span class="Delimiter">);</span>
 <span id="L31" class="LineNr"> 31 </span>
 <span id="L32" class="LineNr"> 32 </span><span class="Delimiter">:(scenario je_rel8_success)</span>
 <span id="L33" class="LineNr"> 33 </span><span class="Special">% ZF = true;</span>
@@ -106,9 +106,9 @@ if ('onhashchange' in window) {
 <span id="L43" class="LineNr"> 43 </span>
 <span id="L44" class="LineNr"> 44 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L45" class="LineNr"> 45 </span><span class="Normal">case</span> <span class="Constant">0x74</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if ZF</span>
-<span id="L46" class="LineNr"> 46 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010vm.cc.html#L190'>next</a><span class="Delimiter">());</span>
+<span id="L46" class="LineNr"> 46 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010vm.cc.html#L193'>next</a><span class="Delimiter">());</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L48" class="LineNr"> 48 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L48" class="LineNr"> 48 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L49" class="LineNr"> 49 </span>    <a href='010vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L50" class="LineNr"> 50 </span>  <span class="Delimiter">}</span>
 <span id="L51" class="LineNr"> 51 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -129,7 +129,7 @@ if ('onhashchange' in window) {
 <span id="L66" class="LineNr"> 66 </span><span class="SalientComment">//:: jump if not equal/not zero</span>
 <span id="L67" class="LineNr"> 67 </span>
 <span id="L68" class="LineNr"> 68 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L69" class="LineNr"> 69 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;75&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if ZF is not set&quot;</span><span class="Delimiter">);</span>
+<span id="L69" class="LineNr"> 69 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;75&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if ZF is not set&quot;</span><span class="Delimiter">);</span>
 <span id="L70" class="LineNr"> 70 </span>
 <span id="L71" class="LineNr"> 71 </span><span class="Delimiter">:(scenario jne_rel8_success)</span>
 <span id="L72" class="LineNr"> 72 </span><span class="Special">% ZF = false;</span>
@@ -145,9 +145,9 @@ if ('onhashchange' in window) {
 <span id="L82" class="LineNr"> 82 </span>
 <span id="L83" class="LineNr"> 83 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L84" class="LineNr"> 84 </span><span class="Normal">case</span> <span class="Constant">0x75</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 unless ZF</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010vm.cc.html#L190'>next</a><span class="Delimiter">());</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010vm.cc.html#L193'>next</a><span class="Delimiter">());</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L88" class="LineNr"> 88 </span>    <a href='010vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L89" class="LineNr"> 89 </span>  <span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -168,7 +168,7 @@ if ('onhashchange' in window) {
 <span id="L105" class="LineNr">105 </span><span class="SalientComment">//:: jump if greater</span>
 <span id="L106" class="LineNr">106 </span>
 <span id="L107" class="LineNr">107 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L108" class="LineNr">108 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;7f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if greater (ZF is unset, SF == OF)&quot;</span><span class="Delimiter">);</span>
+<span id="L108" class="LineNr">108 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;7f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if greater (ZF is unset, SF == OF)&quot;</span><span class="Delimiter">);</span>
 <span id="L109" class="LineNr">109 </span>
 <span id="L110" class="LineNr">110 </span><span class="Delimiter">:(scenario jg_rel8_success)</span>
 <span id="L111" class="LineNr">111 </span><span class="Special">% ZF = false;</span>
@@ -186,9 +186,9 @@ if ('onhashchange' in window) {
 <span id="L123" class="LineNr">123 </span>
 <span id="L124" class="LineNr">124 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L125" class="LineNr">125 </span><span class="Normal">case</span> <span class="Constant">0x7f</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if !SF and !ZF</span>
-<span id="L126" class="LineNr">126 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010vm.cc.html#L190'>next</a><span class="Delimiter">());</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010vm.cc.html#L193'>next</a><span class="Delimiter">());</span>
 <span id="L127" class="LineNr">127 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF &amp;&amp; SF == <a href='010vm.cc.html#L59'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L128" class="LineNr">128 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L128" class="LineNr">128 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L129" class="LineNr">129 </span>    <a href='010vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L130" class="LineNr">130 </span>  <span class="Delimiter">}</span>
 <span id="L131" class="LineNr">131 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -211,7 +211,7 @@ if ('onhashchange' in window) {
 <span id="L148" class="LineNr">148 </span><span class="SalientComment">//:: jump if greater or equal</span>
 <span id="L149" class="LineNr">149 </span>
 <span id="L150" class="LineNr">150 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L151" class="LineNr">151 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;7d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if greater or equal (SF == OF)&quot;</span><span class="Delimiter">);</span>
+<span id="L151" class="LineNr">151 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;7d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if greater or equal (SF == OF)&quot;</span><span class="Delimiter">);</span>
 <span id="L152" class="LineNr">152 </span>
 <span id="L153" class="LineNr">153 </span><span class="Delimiter">:(scenario jge_rel8_success)</span>
 <span id="L154" class="LineNr">154 </span><span class="Special">% SF = false;</span>
@@ -228,9 +228,9 @@ if ('onhashchange' in window) {
 <span id="L165" class="LineNr">165 </span>
 <span id="L166" class="LineNr">166 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L167" class="LineNr">167 </span><span class="Normal">case</span> <span class="Constant">0x7d</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if !SF</span>
-<span id="L168" class="LineNr">168 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010vm.cc.html#L190'>next</a><span class="Delimiter">());</span>
+<span id="L168" class="LineNr">168 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010vm.cc.html#L193'>next</a><span class="Delimiter">());</span>
 <span id="L169" class="LineNr">169 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF == <a href='010vm.cc.html#L59'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L170" class="LineNr">170 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L170" class="LineNr">170 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L171" class="LineNr">171 </span>    <a href='010vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L172" class="LineNr">172 </span>  <span class="Delimiter">}</span>
 <span id="L173" class="LineNr">173 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -252,7 +252,7 @@ if ('onhashchange' in window) {
 <span id="L189" class="LineNr">189 </span><span class="SalientComment">//:: jump if lesser</span>
 <span id="L190" class="LineNr">190 </span>
 <span id="L191" class="LineNr">191 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L192" class="LineNr">192 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;7c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if lesser (SF != OF)&quot;</span><span class="Delimiter">);</span>
+<span id="L192" class="LineNr">192 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;7c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if lesser (SF != OF)&quot;</span><span class="Delimiter">);</span>
 <span id="L193" class="LineNr">193 </span>
 <span id="L194" class="LineNr">194 </span><span class="Delimiter">:(scenario jl_rel8_success)</span>
 <span id="L195" class="LineNr">195 </span><span class="Special">% ZF = false;</span>
@@ -270,9 +270,9 @@ if ('onhashchange' in window) {
 <span id="L207" class="LineNr">207 </span>
 <span id="L208" class="LineNr">208 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L209" class="LineNr">209 </span><span class="Normal">case</span> <span class="Constant">0x7c</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if SF and !ZF</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010vm.cc.html#L190'>next</a><span class="Delimiter">());</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010vm.cc.html#L193'>next</a><span class="Delimiter">());</span>
 <span id="L211" class="LineNr">211 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF != <a href='010vm.cc.html#L59'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L212" class="LineNr">212 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L212" class="LineNr">212 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L213" class="LineNr">213 </span>    <a href='010vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L214" class="LineNr">214 </span>  <span class="Delimiter">}</span>
 <span id="L215" class="LineNr">215 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -295,7 +295,7 @@ if ('onhashchange' in window) {
 <span id="L232" class="LineNr">232 </span><span class="SalientComment">//:: jump if lesser or equal</span>
 <span id="L233" class="LineNr">233 </span>
 <span id="L234" class="LineNr">234 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L235" class="LineNr">235 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;7e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if lesser or equal (ZF is set or SF != OF)&quot;</span><span class="Delimiter">);</span>
+<span id="L235" class="LineNr">235 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;7e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if lesser or equal (ZF is set or SF != OF)&quot;</span><span class="Delimiter">);</span>
 <span id="L236" class="LineNr">236 </span>
 <span id="L237" class="LineNr">237 </span><span class="Delimiter">:(scenario jle_rel8_equal)</span>
 <span id="L238" class="LineNr">238 </span><span class="Special">% ZF = true;</span>
@@ -327,9 +327,9 @@ if ('onhashchange' in window) {
 <span id="L264" class="LineNr">264 </span>
 <span id="L265" class="LineNr">265 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L266" class="LineNr">266 </span><span class="Normal">case</span> <span class="Constant">0x7e</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if SF or ZF</span>
-<span id="L267" class="LineNr">267 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010vm.cc.html#L190'>next</a><span class="Delimiter">());</span>
+<span id="L267" class="LineNr">267 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010vm.cc.html#L193'>next</a><span class="Delimiter">());</span>
 <span id="L268" class="LineNr">268 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF || SF != <a href='010vm.cc.html#L59'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L269" class="LineNr">269 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L269" class="LineNr">269 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L270" class="LineNr">270 </span>    <a href='010vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L271" class="LineNr">271 </span>  <span class="Delimiter">}</span>
 <span id="L272" class="LineNr">272 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/subx/017jump_relative.cc.html b/html/subx/018jump_disp16.cc.html
index 6acad3f0..b4e62f89 100644
--- a/html/subx/017jump_relative.cc.html
+++ b/html/subx/018jump_disp16.cc.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/017jump_relative.cc</title>
+<title>Mu - subx/018jump_disp16.cc</title>
 <meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
@@ -66,7 +66,7 @@ if ('onhashchange' in window) {
 <span id="L3" class="LineNr">  3 </span><span class="SalientComment">//:: jump</span>
 <span id="L4" class="LineNr">  4 </span>
 <span id="L5" class="LineNr">  5 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L6" class="LineNr">  6 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away&quot;</span><span class="Delimiter">);</span>
+<span id="L6" class="LineNr">  6 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away&quot;</span><span class="Delimiter">);</span>
 <span id="L7" class="LineNr">  7 </span>
 <span id="L8" class="LineNr">  8 </span><span class="Delimiter">:(scenario jump_rel16)</span>
 <span id="L9" class="LineNr">  9 </span>== <span class="Constant">0x1</span>
@@ -81,22 +81,22 @@ if ('onhashchange' in window) {
 <span id="L18" class="LineNr"> 18 </span>
 <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L20" class="LineNr"> 20 </span><span class="Normal">case</span> <span class="Constant">0xe9</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="Normal">int16_t</span> offset = <a href='017jump_relative.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
-<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; offset &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>  <span class="Normal">int16_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
+<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; offset &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L23" class="LineNr"> 23 </span>  <a href='010vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L25" class="LineNr"> 25 </span><span class="Delimiter">}</span>
 <span id="L26" class="LineNr"> 26 </span><span class="Delimiter">:(code)</span>
-<span id="L27" class="LineNr"> 27 </span><span class="Normal">int16_t</span> <a href='017jump_relative.cc.html#L27'>imm16</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L28" class="LineNr"> 28 </span>  <span class="Normal">int16_t</span> result = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
-<span id="L29" class="LineNr"> 29 </span>  result |= <span class="Delimiter">(</span><a href='010vm.cc.html#L190'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L27" class="LineNr"> 27 </span><span class="Normal">int16_t</span> <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="Normal">int16_t</span> result = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
+<span id="L29" class="LineNr"> 29 </span>  result |= <span class="Delimiter">(</span><a href='010vm.cc.html#L193'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
 <span id="L30" class="LineNr"> 30 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L31" class="LineNr"> 31 </span><span class="Delimiter">}</span>
 <span id="L32" class="LineNr"> 32 </span>
 <span id="L33" class="LineNr"> 33 </span><span class="SalientComment">//:: jump if equal/zero</span>
 <span id="L34" class="LineNr"> 34 </span>
 <span id="L35" class="LineNr"> 35 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L36" class="LineNr"> 36 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L197'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if ZF is set&quot;</span><span class="Delimiter">);</span>
+<span id="L36" class="LineNr"> 36 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L208'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if ZF is set&quot;</span><span class="Delimiter">);</span>
 <span id="L37" class="LineNr"> 37 </span>
 <span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(scenario je_rel16_success)</span>
 <span id="L39" class="LineNr"> 39 </span><span class="Special">% ZF = true;</span>
@@ -112,9 +112,9 @@ if ('onhashchange' in window) {
 <span id="L49" class="LineNr"> 49 </span>
 <span id="L50" class="LineNr"> 50 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
 <span id="L51" class="LineNr"> 51 </span><span class="Normal">case</span> <span class="Constant">0x84</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 if ZF</span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="Normal">int8_t</span> offset = <a href='017jump_relative.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
 <span id="L53" class="LineNr"> 53 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L55" class="LineNr"> 55 </span>    <a href='010vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L56" class="LineNr"> 56 </span>  <span class="Delimiter">}</span>
 <span id="L57" class="LineNr"> 57 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -135,7 +135,7 @@ if ('onhashchange' in window) {
 <span id="L72" class="LineNr"> 72 </span><span class="SalientComment">//:: jump if not equal/not zero</span>
 <span id="L73" class="LineNr"> 73 </span>
 <span id="L74" class="LineNr"> 74 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L75" class="LineNr"> 75 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L197'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if ZF is not set&quot;</span><span class="Delimiter">);</span>
+<span id="L75" class="LineNr"> 75 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L208'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if ZF is not set&quot;</span><span class="Delimiter">);</span>
 <span id="L76" class="LineNr"> 76 </span>
 <span id="L77" class="LineNr"> 77 </span><span class="Delimiter">:(scenario jne_rel16_success)</span>
 <span id="L78" class="LineNr"> 78 </span><span class="Special">% ZF = false;</span>
@@ -151,9 +151,9 @@ if ('onhashchange' in window) {
 <span id="L88" class="LineNr"> 88 </span>
 <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
 <span id="L90" class="LineNr"> 90 </span><span class="Normal">case</span> <span class="Constant">0x85</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 unless ZF</span>
-<span id="L91" class="LineNr"> 91 </span>  <span class="Normal">int8_t</span> offset = <a href='017jump_relative.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
+<span id="L91" class="LineNr"> 91 </span>  <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L93" class="LineNr"> 93 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L93" class="LineNr"> 93 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L94" class="LineNr"> 94 </span>    <a href='010vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L95" class="LineNr"> 95 </span>  <span class="Delimiter">}</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -174,7 +174,7 @@ if ('onhashchange' in window) {
 <span id="L111" class="LineNr">111 </span><span class="SalientComment">//:: jump if greater</span>
 <span id="L112" class="LineNr">112 </span>
 <span id="L113" class="LineNr">113 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L114" class="LineNr">114 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L197'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if greater (ZF is unset, SF == OF)&quot;</span><span class="Delimiter">);</span>
+<span id="L114" class="LineNr">114 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L208'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if greater (ZF is unset, SF == OF)&quot;</span><span class="Delimiter">);</span>
 <span id="L115" class="LineNr">115 </span>
 <span id="L116" class="LineNr">116 </span><span class="Delimiter">:(scenario jg_rel16_success)</span>
 <span id="L117" class="LineNr">117 </span><span class="Special">% ZF = false;</span>
@@ -192,9 +192,9 @@ if ('onhashchange' in window) {
 <span id="L129" class="LineNr">129 </span>
 <span id="L130" class="LineNr">130 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
 <span id="L131" class="LineNr">131 </span><span class="Normal">case</span> <span class="Constant">0x8f</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 if !SF and !ZF</span>
-<span id="L132" class="LineNr">132 </span>  <span class="Normal">int8_t</span> offset = <a href='017jump_relative.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
+<span id="L132" class="LineNr">132 </span>  <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
 <span id="L133" class="LineNr">133 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF &amp;&amp; SF == <a href='010vm.cc.html#L59'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L134" class="LineNr">134 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L134" class="LineNr">134 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L135" class="LineNr">135 </span>    <a href='010vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L136" class="LineNr">136 </span>  <span class="Delimiter">}</span>
 <span id="L137" class="LineNr">137 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -217,7 +217,7 @@ if ('onhashchange' in window) {
 <span id="L154" class="LineNr">154 </span><span class="SalientComment">//:: jump if greater or equal</span>
 <span id="L155" class="LineNr">155 </span>
 <span id="L156" class="LineNr">156 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L157" class="LineNr">157 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L197'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if greater or equal (SF == OF)&quot;</span><span class="Delimiter">);</span>
+<span id="L157" class="LineNr">157 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L208'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if greater or equal (SF == OF)&quot;</span><span class="Delimiter">);</span>
 <span id="L158" class="LineNr">158 </span>
 <span id="L159" class="LineNr">159 </span><span class="Delimiter">:(scenario jge_rel16_success)</span>
 <span id="L160" class="LineNr">160 </span><span class="Special">% SF = false;</span>
@@ -234,9 +234,9 @@ if ('onhashchange' in window) {
 <span id="L171" class="LineNr">171 </span>
 <span id="L172" class="LineNr">172 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
 <span id="L173" class="LineNr">173 </span><span class="Normal">case</span> <span class="Constant">0x8d</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 if !SF</span>
-<span id="L174" class="LineNr">174 </span>  <span class="Normal">int8_t</span> offset = <a href='017jump_relative.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
+<span id="L174" class="LineNr">174 </span>  <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
 <span id="L175" class="LineNr">175 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF == <a href='010vm.cc.html#L59'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L176" class="LineNr">176 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L176" class="LineNr">176 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L177" class="LineNr">177 </span>    <a href='010vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L178" class="LineNr">178 </span>  <span class="Delimiter">}</span>
 <span id="L179" class="LineNr">179 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -258,7 +258,7 @@ if ('onhashchange' in window) {
 <span id="L195" class="LineNr">195 </span><span class="SalientComment">//:: jump if lesser</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='010vm.cc.html#L197'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if lesser (SF != OF)&quot;</span><span class="Delimiter">);</span>
+<span id="L198" class="LineNr">198 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L208'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if lesser (SF != OF)&quot;</span><span class="Delimiter">);</span>
 <span id="L199" class="LineNr">199 </span>
 <span id="L200" class="LineNr">200 </span><span class="Delimiter">:(scenario jl_rel16_success)</span>
 <span id="L201" class="LineNr">201 </span><span class="Special">% ZF = false;</span>
@@ -276,9 +276,9 @@ if ('onhashchange' in window) {
 <span id="L213" class="LineNr">213 </span>
 <span id="L214" class="LineNr">214 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
 <span id="L215" class="LineNr">215 </span><span class="Normal">case</span> <span class="Constant">0x8c</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 if SF and !ZF</span>
-<span id="L216" class="LineNr">216 </span>  <span class="Normal">int8_t</span> offset = <a href='017jump_relative.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
+<span id="L216" class="LineNr">216 </span>  <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
 <span id="L217" class="LineNr">217 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF != <a href='010vm.cc.html#L59'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L218" class="LineNr">218 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L218" class="LineNr">218 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L219" class="LineNr">219 </span>    <a href='010vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L220" class="LineNr">220 </span>  <span class="Delimiter">}</span>
 <span id="L221" class="LineNr">221 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -301,7 +301,7 @@ if ('onhashchange' in window) {
 <span id="L238" class="LineNr">238 </span><span class="SalientComment">//:: jump if lesser or equal</span>
 <span id="L239" class="LineNr">239 </span>
 <span id="L240" class="LineNr">240 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L241" class="LineNr">241 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L197'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if lesser or equal (ZF is set or SF != OF)&quot;</span><span class="Delimiter">);</span>
+<span id="L241" class="LineNr">241 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L208'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if lesser or equal (ZF is set or SF != OF)&quot;</span><span class="Delimiter">);</span>
 <span id="L242" class="LineNr">242 </span>
 <span id="L243" class="LineNr">243 </span><span class="Delimiter">:(scenario jle_rel16_equal)</span>
 <span id="L244" class="LineNr">244 </span><span class="Special">% ZF = true;</span>
@@ -333,9 +333,9 @@ if ('onhashchange' in window) {
 <span id="L270" class="LineNr">270 </span>
 <span id="L271" class="LineNr">271 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
 <span id="L272" class="LineNr">272 </span><span class="Normal">case</span> <span class="Constant">0x8e</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 if SF or ZF</span>
-<span id="L273" class="LineNr">273 </span>  <span class="Normal">int8_t</span> offset = <a href='017jump_relative.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
+<span id="L273" class="LineNr">273 </span>  <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
 <span id="L274" class="LineNr">274 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF || SF != <a href='010vm.cc.html#L59'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L275" class="LineNr">275 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L275" class="LineNr">275 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L276" class="LineNr">276 </span>    <a href='010vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L277" class="LineNr">277 </span>  <span class="Delimiter">}</span>
 <span id="L278" class="LineNr">278 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/subx/018functions.cc.html b/html/subx/019functions.cc.html
index 3e9ceab1..a45b9ddb 100644
--- a/html/subx/018functions.cc.html
+++ b/html/subx/019functions.cc.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/018functions.cc</title>
+<title>Mu - subx/019functions.cc</title>
 <meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
@@ -20,11 +20,12 @@ a:hover { text-decoration: underline; }
 .SalientComment { color: #00ffff; }
 .Delimiter { color: #800080; }
 .LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
+.CommentedCode { color: #6c6c6c; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .PreProc { color: #800080; }
 .traceContains { color: #008000; }
+.Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 -->
 </style>
@@ -63,7 +64,7 @@ if ('onhashchange' in window) {
 <span id="L1" class="LineNr"> 1 </span><span class="SalientComment">//:: call</span>
 <span id="L2" class="LineNr"> 2 </span>
 <span id="L3" class="LineNr"> 3 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L4" class="LineNr"> 4 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;call disp32&quot;</span><span class="Delimiter">);</span>
+<span id="L4" class="LineNr"> 4 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;call disp32&quot;</span><span class="Delimiter">);</span>
 <span id="L5" class="LineNr"> 5 </span>
 <span id="L6" class="LineNr"> 6 </span><span class="Delimiter">:(scenario call_disp32)</span>
 <span id="L7" class="LineNr"> 7 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
@@ -79,76 +80,77 @@ if ('onhashchange' in window) {
 <span id="L17" class="LineNr">17 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L18" class="LineNr">18 </span><span class="Normal">case</span> <span class="Constant">0xe8</span>: <span class="Delimiter">{</span>  <span class="Comment">// call disp32 relative to next EIP</span>
 <span id="L19" class="LineNr">19 </span>  <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L253'>imm32</a><span class="Delimiter">();</span>
-<span id="L20" class="LineNr">20 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; offset &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L21" class="LineNr">21 </span>  <a href='012direct_addressing.cc.html#L344'>push</a><span class="Delimiter">(</span><a href='010vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
-<span id="L22" class="LineNr">22 </span>  <a href='010vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L23" class="LineNr">23 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; <a href='010vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L24" class="LineNr">24 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L25" class="LineNr">25 </span><span class="Delimiter">}</span>
-<span id="L26" class="LineNr">26 </span>
-<span id="L27" class="LineNr">27 </span><span class="Comment">//:</span>
-<span id="L28" class="LineNr">28 </span>
-<span id="L29" class="LineNr">29 </span><span class="Delimiter">:(scenario call_r32)</span>
-<span id="L30" class="LineNr">30 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L31" class="LineNr">31 </span><span class="Special">% Reg[EBX].u = 0x000000a0;</span>
-<span id="L32" class="LineNr">32 </span>== <span class="Constant">0x1</span>
-<span id="L33" class="LineNr">33 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L34" class="LineNr">34 </span>  ff  d3                                       <span class="Comment"># call function offset at EBX</span>
-<span id="L35" class="LineNr">35 </span>  <span class="Comment"># next EIP is 3</span>
-<span id="L36" class="LineNr">36 </span><span class="traceContains">+run: call to r/m32</span>
-<span id="L37" class="LineNr">37 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L16'>EBX</a></span>
-<span id="L38" class="LineNr">38 </span><span class="traceContains">+run: decrementing <a href='010vm.cc.html#L17'>ESP</a> to 0x00000060</span>
-<span id="L39" class="LineNr">39 </span><span class="traceContains">+run: pushing value 0x00000003</span>
-<span id="L40" class="LineNr">40 </span><span class="traceContains">+run: jumping to 0x000000a3</span>
-<span id="L41" class="LineNr">41 </span>
-<span id="L42" class="LineNr">42 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
-<span id="L43" class="LineNr">43 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span>  <span class="Comment">// call function pointer at r/m32</span>
-<span id="L44" class="LineNr">44 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L45" class="LineNr">45 </span>  <span class="Normal">int32_t</span>* offset = <a href='012direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L46" class="LineNr">46 </span>  <a href='012direct_addressing.cc.html#L344'>push</a><span class="Delimiter">(</span><a href='010vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
-<span id="L47" class="LineNr">47 </span>  <a href='010vm.cc.html#L29'>EIP</a> += *offset<span class="Delimiter">;</span>
-<span id="L48" class="LineNr">48 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; <a href='010vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L49" class="LineNr">49 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L50" class="LineNr">50 </span><span class="Delimiter">}</span>
-<span id="L51" class="LineNr">51 </span>
-<span id="L52" class="LineNr">52 </span><span class="Delimiter">:(scenario call_mem_at_r32)</span>
-<span id="L53" class="LineNr">53 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L54" class="LineNr">54 </span><span class="Special">% Reg[EBX].u = 0x10;</span>
-<span id="L55" class="LineNr">55 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L56" class="LineNr">56 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L57" class="LineNr">57 </span>  ff  <span class="Constant">13</span>                                       <span class="Comment"># call function offset at *EBX</span>
-<span id="L58" class="LineNr">58 </span>  <span class="Comment"># next EIP is 3</span>
-<span id="L59" class="LineNr">59 </span>== <span class="Constant">0x10</span>  <span class="Comment"># data segment</span>
-<span id="L60" class="LineNr">60 </span>a0 <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0xa0</span>
-<span id="L61" class="LineNr">61 </span><span class="traceContains">+run: call to r/m32</span>
-<span id="L62" class="LineNr">62 </span><span class="traceContains">+run: effective address is 0x10 (EBX)</span>
-<span id="L63" class="LineNr">63 </span><span class="traceContains">+run: decrementing <a href='010vm.cc.html#L17'>ESP</a> to 0x00000060</span>
-<span id="L64" class="LineNr">64 </span><span class="traceContains">+run: pushing value 0x00000003</span>
-<span id="L65" class="LineNr">65 </span><span class="traceContains">+run: jumping to 0x000000a3</span>
-<span id="L66" class="LineNr">66 </span>
-<span id="L67" class="LineNr">67 </span><span class="SalientComment">//:: ret</span>
-<span id="L68" class="LineNr">68 </span>
-<span id="L69" class="LineNr">69 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L70" class="LineNr">70 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;return from most recent unfinished call&quot;</span><span class="Delimiter">);</span>
-<span id="L71" class="LineNr">71 </span>
-<span id="L72" class="LineNr">72 </span><span class="Delimiter">:(scenario ret)</span>
-<span id="L73" class="LineNr">73 </span><span class="Special">% Reg[ESP].u = 0x60;</span>
-<span id="L74" class="LineNr">74 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L75" class="LineNr">75 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L76" class="LineNr">76 </span>  c3
-<span id="L77" class="LineNr">77 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L78" class="LineNr">78 </span><span class="Constant">10</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"># 0x10</span>
-<span id="L79" class="LineNr">79 </span><span class="traceContains">+run: return</span>
-<span id="L80" class="LineNr">80 </span><span class="traceContains">+run: popping value 0x00000010</span>
-<span id="L81" class="LineNr">81 </span><span class="traceContains">+run: jumping to 0x00000010</span>
-<span id="L82" class="LineNr">82 </span>
-<span id="L83" class="LineNr">83 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L84" class="LineNr">84 </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="L85" class="LineNr">85 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L86" class="LineNr">86 </span>  <a href='010vm.cc.html#L29'>EIP</a> = <a href='012direct_addressing.cc.html#L390'>pop</a><span class="Delimiter">();</span>
-<span id="L87" class="LineNr">87 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; <a href='010vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L88" class="LineNr">88 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L89" class="LineNr">89 </span><span class="Delimiter">}</span>
+<span id="L20" class="LineNr">20 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call <a href='011run.cc.html#L253'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; offset &lt;&lt; <a href='003trace.cc.html#L215'>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='013direct_addressing.cc.html#L371'>push</a><span class="Delimiter">(</span><a href='010vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
+<span id="L23" class="LineNr">23 </span>  <a href='010vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L24" class="LineNr">24 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; <a href='010vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L25" class="LineNr">25 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L26" class="LineNr">26 </span><span class="Delimiter">}</span>
+<span id="L27" class="LineNr">27 </span>
+<span id="L28" class="LineNr">28 </span><span class="Comment">//:</span>
+<span id="L29" class="LineNr">29 </span>
+<span id="L30" class="LineNr">30 </span><span class="Delimiter">:(scenario call_r32)</span>
+<span id="L31" class="LineNr">31 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
+<span id="L32" class="LineNr">32 </span><span class="Special">% Reg[EBX].u = 0x000000a0;</span>
+<span id="L33" class="LineNr">33 </span>== <span class="Constant">0x1</span>
+<span id="L34" class="LineNr">34 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L35" class="LineNr">35 </span>  ff  d3                                       <span class="Comment"># call function offset at EBX</span>
+<span id="L36" class="LineNr">36 </span>  <span class="Comment"># next EIP is 3</span>
+<span id="L37" class="LineNr">37 </span><span class="traceContains">+run: call to r/m32</span>
+<span id="L38" class="LineNr">38 </span><span class="traceContains">+run: r/m32 is <a href='010vm.cc.html#L16'>EBX</a></span>
+<span id="L39" class="LineNr">39 </span><span class="traceContains">+run: decrementing <a href='010vm.cc.html#L17'>ESP</a> to 0x00000060</span>
+<span id="L40" class="LineNr">40 </span><span class="traceContains">+run: pushing value 0x00000003</span>
+<span id="L41" class="LineNr">41 </span><span class="traceContains">+run: jumping to 0x000000a3</span>
+<span id="L42" class="LineNr">42 </span>
+<span id="L43" class="LineNr">43 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
+<span id="L44" class="LineNr">44 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span>  <span class="Comment">// call function pointer at r/m32</span>
+<span id="L45" class="LineNr">45 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L46" class="LineNr">46 </span>  <span class="Normal">int32_t</span>* offset = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L47" class="LineNr">47 </span>  <a href='013direct_addressing.cc.html#L371'>push</a><span class="Delimiter">(</span><a href='010vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
+<span id="L48" class="LineNr">48 </span>  <a href='010vm.cc.html#L29'>EIP</a> += *offset<span class="Delimiter">;</span>
+<span id="L49" class="LineNr">49 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; <a href='010vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L50" class="LineNr">50 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L51" class="LineNr">51 </span><span class="Delimiter">}</span>
+<span id="L52" class="LineNr">52 </span>
+<span id="L53" class="LineNr">53 </span><span class="Delimiter">:(scenario call_mem_at_r32)</span>
+<span id="L54" class="LineNr">54 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
+<span id="L55" class="LineNr">55 </span><span class="Special">% Reg[EBX].u = 0x10;</span>
+<span id="L56" class="LineNr">56 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L57" class="LineNr">57 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L58" class="LineNr">58 </span>  ff  <span class="Constant">13</span>                                       <span class="Comment"># call function offset at *EBX</span>
+<span id="L59" class="LineNr">59 </span>  <span class="Comment"># next EIP is 3</span>
+<span id="L60" class="LineNr">60 </span>== <span class="Constant">0x10</span>  <span class="Comment"># data segment</span>
+<span id="L61" class="LineNr">61 </span>a0 <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0xa0</span>
+<span id="L62" class="LineNr">62 </span><span class="traceContains">+run: call to r/m32</span>
+<span id="L63" class="LineNr">63 </span><span class="traceContains">+run: effective address is 0x10 (EBX)</span>
+<span id="L64" class="LineNr">64 </span><span class="traceContains">+run: decrementing <a href='010vm.cc.html#L17'>ESP</a> to 0x00000060</span>
+<span id="L65" class="LineNr">65 </span><span class="traceContains">+run: pushing value 0x00000003</span>
+<span id="L66" class="LineNr">66 </span><span class="traceContains">+run: jumping to 0x000000a3</span>
+<span id="L67" class="LineNr">67 </span>
+<span id="L68" class="LineNr">68 </span><span class="SalientComment">//:: ret</span>
+<span id="L69" class="LineNr">69 </span>
+<span id="L70" class="LineNr">70 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L71" class="LineNr">71 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;return from most recent unfinished call&quot;</span><span class="Delimiter">);</span>
+<span id="L72" class="LineNr">72 </span>
+<span id="L73" class="LineNr">73 </span><span class="Delimiter">:(scenario ret)</span>
+<span id="L74" class="LineNr">74 </span><span class="Special">% Reg[ESP].u = 0x60;</span>
+<span id="L75" class="LineNr">75 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L76" class="LineNr">76 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L77" class="LineNr">77 </span>  c3
+<span id="L78" class="LineNr">78 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L79" class="LineNr">79 </span><span class="Constant">10</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"># 0x10</span>
+<span id="L80" class="LineNr">80 </span><span class="traceContains">+run: return</span>
+<span id="L81" class="LineNr">81 </span><span class="traceContains">+run: popping value 0x00000010</span>
+<span id="L82" class="LineNr">82 </span><span class="traceContains">+run: jumping to 0x00000010</span>
+<span id="L83" class="LineNr">83 </span>
+<span id="L84" class="LineNr">84 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L85" class="LineNr">85 </span><span class="Normal">case</span> <span class="Constant">0xc3</span>: <span class="Delimiter">{</span>  <span class="Comment">// return from a call</span>
+<span id="L86" class="LineNr">86 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L87" class="LineNr">87 </span>  <a href='010vm.cc.html#L29'>EIP</a> = <a href='013direct_addressing.cc.html#L419'>pop</a><span class="Delimiter">();</span>
+<span id="L88" class="LineNr">88 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="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='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; <a href='010vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L215'>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>
 </pre>
 </body>
 </html>
diff --git a/html/subx/019syscalls.cc.html b/html/subx/020syscalls.cc.html
index 72db7525..c29ac354 100644
--- a/html/subx/019syscalls.cc.html
+++ b/html/subx/020syscalls.cc.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/019syscalls.cc</title>
+<title>Mu - subx/020syscalls.cc</title>
 <meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
@@ -58,23 +58,23 @@ if ('onhashchange' in window) {
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr"> 1 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L2" class="LineNr"> 2 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;cd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;software interrupt&quot;</span><span class="Delimiter">);</span>
+<span id="L2" class="LineNr"> 2 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;cd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;software interrupt&quot;</span><span class="Delimiter">);</span>
 <span id="L3" class="LineNr"> 3 </span>
 <span id="L4" class="LineNr"> 4 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L5" class="LineNr"> 5 </span><span class="Normal">case</span> <span class="Constant">0xcd</span>: <span class="Delimiter">{</span>  <span class="Comment">// int imm8 (software interrupt)</span>
-<span id="L6" class="LineNr"> 6 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;syscall&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L7" class="LineNr"> 7 </span>  <span class="Normal">uint8_t</span> code = <a href='010vm.cc.html#L190'>next</a><span class="Delimiter">();</span>
+<span id="L6" class="LineNr"> 6 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;syscall&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L7" class="LineNr"> 7 </span>  <span class="Normal">uint8_t</span> code = <a href='010vm.cc.html#L193'>next</a><span class="Delimiter">();</span>
 <span id="L8" class="LineNr"> 8 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>code != <span class="Constant">0x80</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L9" class="LineNr"> 9 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;Unimplemented interrupt code &quot;</span> &lt;&lt; <a href='010vm.cc.html#L227'>HEXBYTE</a> &lt;&lt; code &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L10" class="LineNr">10 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  Only `int 80h` supported for now.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L9" class="LineNr"> 9 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;Unimplemented interrupt code &quot;</span> &lt;&lt; <a href='010vm.cc.html#L238'>HEXBYTE</a> &lt;&lt; code &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L10" class="LineNr">10 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  Only `int 80h` supported for now.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L11" class="LineNr">11 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L12" class="LineNr">12 </span>  <span class="Delimiter">}</span>
-<span id="L13" class="LineNr">13 </span>  <a href='019syscalls.cc.html#L18'>process_int80</a><span class="Delimiter">();</span>
+<span id="L13" class="LineNr">13 </span>  <a href='020syscalls.cc.html#L18'>process_int80</a><span class="Delimiter">();</span>
 <span id="L14" class="LineNr">14 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L15" class="LineNr">15 </span><span class="Delimiter">}</span>
 <span id="L16" class="LineNr">16 </span>
 <span id="L17" class="LineNr">17 </span><span class="Delimiter">:(code)</span>
-<span id="L18" class="LineNr">18 </span><span class="Normal">void</span> <a href='019syscalls.cc.html#L18'>process_int80</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L18" class="LineNr">18 </span><span class="Normal">void</span> <a href='020syscalls.cc.html#L18'>process_int80</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L19" class="LineNr">19 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L20" class="LineNr">20 </span>  <span class="Normal">case</span> <span class="Constant">1</span>:
 <span id="L21" class="LineNr">21 </span>    exit<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">exit code</span><span class="Comment">*/</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
@@ -86,12 +86,9 @@ if ('onhashchange' in window) {
 <span id="L27" class="LineNr">27 </span>    Reg[EAX]<span class="Delimiter">.</span>i = write<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">file descriptor</span><span class="Comment">*/</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">memory buffer</span><span class="Comment">*/</span><a href='010vm.cc.html#L117'>mem_addr_u8</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">size</span><span class="Comment">*/</span>Reg[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L28" class="LineNr">28 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L29" class="LineNr">29 </span>  <span class="Normal">default</span>:
-<span id="L30" class="LineNr">30 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; <a href='010vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: unimplemented syscall &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>u &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L30" class="LineNr">30 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; <a href='010vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: unimplemented syscall &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>u &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L31" class="LineNr">31 </span>  <span class="Delimiter">}</span>
 <span id="L32" class="LineNr">32 </span><span class="Delimiter">}</span>
-<span id="L33" class="LineNr">33 </span>
-<span id="L34" class="LineNr">34 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L35" class="LineNr">35 </span><span class="Comment">#include &lt;unistd.h&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/021translate.cc.html b/html/subx/021translate.cc.html
deleted file mode 100644
index 294eca80..00000000
--- a/html/subx/021translate.cc.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<!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/021translate.cc</title>
-<meta name="Generator" content="Vim/7.4">
-<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; }
-.Constant { color: #00a0a0; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
--->
-</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">//: The bedrock level 1 of abstraction is now done, and we're going to start</span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment">//: building levels above it that make programming in x86 machine code a</span>
-<span id="L3" class="LineNr">  3 </span><span class="Comment">//: little more ergonomic.</span>
-<span id="L4" class="LineNr">  4 </span><span class="Comment">//:</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment">//: Higher levels will be in later layers. Since we can stop at any layer, we</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment">//: can execute levels from bedrock up to any level.</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment">//:</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment">//: All levels will be &quot;pass through by default&quot;. Whatever they don't</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment">//: understand they will silently pass through to lower levels.</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment">//:</span>
-<span id="L11" class="LineNr"> 11 </span><span class="Comment">//: Since raw hex bytes of machine code are always possible to inject, SubX is</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Comment">//: not a language, and we aren't building a compiler. This is something</span>
-<span id="L13" class="LineNr"> 13 </span><span class="Comment">//: deliberately leakier. Levels are more for improving auditing, checks and</span>
-<span id="L14" class="LineNr"> 14 </span><span class="Comment">//: error messages rather than for hiding low-level details.</span>
-<span id="L15" class="LineNr"> 15 </span>
-<span id="L16" class="LineNr"> 16 </span><span class="Comment">//: Translator workflow: read 'source' file. Run a series of transforms on it,</span>
-<span id="L17" class="LineNr"> 17 </span><span class="Comment">//: each passing through what it doesn't understand. The final program should</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Comment">//: be just machine code, suitable to write to an ELF binary.</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Comment">//:</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Comment">//: Higher levels usually transform code on the basis of metadata.</span>
-<span id="L21" class="LineNr"> 21 </span>
-<span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(before &quot;End Main&quot;)</span>
-<span id="L23" class="LineNr"> 23 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;translate&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L24" class="LineNr"> 24 </span>  <a href='003trace.cc.html#L236'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span>
-<span id="L25" class="LineNr"> 25 </span>  assert<span class="Delimiter">(</span>argc &gt; <span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L26" class="LineNr"> 26 </span>  <a href='011run.cc.html#L94'>program</a> p<span class="Delimiter">;</span>
-<span id="L27" class="LineNr"> 27 </span>  ifstream fin<span class="Delimiter">(</span>argv[<span class="Constant">2</span>]<span class="Delimiter">);</span>
-<span id="L28" class="LineNr"> 28 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!fin<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L29" class="LineNr"> 29 </span>    cerr &lt;&lt; <span class="Constant">&quot;could not open &quot;</span> &lt;&lt; argv[<span class="Constant">2</span>] &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L30" class="LineNr"> 30 </span>    <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L31" class="LineNr"> 31 </span>  <span class="Delimiter">}</span>
-<span id="L32" class="LineNr"> 32 </span>  <a href='011run.cc.html#L122'>parse</a><span class="Delimiter">(</span>fin<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#L208'>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>  transform<span class="Delimiter">(</span>p<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#L208'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L36" class="LineNr"> 36 </span>  <a href='021translate.cc.html#L43'>save_elf</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> argv[<span class="Constant">3</span>]<span class="Delimiter">);</span>
-<span id="L37" class="LineNr"> 37 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L208'>trace_contains_errors</a><span class="Delimiter">())</span> unlink<span class="Delimiter">(</span>argv[<span class="Constant">3</span>]<span class="Delimiter">);</span>
-<span id="L38" class="LineNr"> 38 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L39" class="LineNr"> 39 </span><span class="Delimiter">}</span>
-<span id="L40" class="LineNr"> 40 </span>
-<span id="L41" class="LineNr"> 41 </span><span class="Delimiter">:(code)</span>
-<span id="L42" class="LineNr"> 42 </span><span class="Comment">// write out a program to a bare-bones ELF file</span>
-<span id="L43" class="LineNr"> 43 </span><span class="Normal">void</span> <a href='021translate.cc.html#L43'>save_elf</a><span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">,</span> <span class="Normal">const</span> <span class="Normal">char</span>* filename<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L44" class="LineNr"> 44 </span>  ofstream out<span class="Delimiter">(</span>filename<span class="Delimiter">,</span> ios::binary<span class="Delimiter">);</span>
-<span id="L45" class="LineNr"> 45 </span>  <a href='021translate.cc.html#L51'>write_elf_header</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L46" class="LineNr"> 46 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>size<span class="Delimiter">();</span>  ++i<span class="Delimiter">)</span>
-<span id="L47" class="LineNr"> 47 </span>    <a href='021translate.cc.html#L144'>write_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> out<span class="Delimiter">);</span>
-<span id="L48" class="LineNr"> 48 </span>  out<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
-<span id="L49" class="LineNr"> 49 </span><span class="Delimiter">}</span>
-<span id="L50" class="LineNr"> 50 </span>
-<span id="L51" class="LineNr"> 51 </span><span class="Normal">void</span> <a href='021translate.cc.html#L51'>write_elf_header</a><span class="Delimiter">(</span>ostream&amp; out<span class="Delimiter">,</span> <span class="Normal">const</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="Normal">char</span> c = <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
-<span id="L53" class="LineNr"> 53 </span><span class="Comment">#define O(X)  c = (X); out.write(&amp;c, sizeof(c))</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Comment">// host is required to be little-endian</span>
-<span id="L55" class="LineNr"> 55 </span><span class="Comment">#define emit(X)  out.write(reinterpret_cast&lt;const char*&gt;(&amp;X), sizeof(X))</span>
-<span id="L56" class="LineNr"> 56 </span>  <span class="SalientComment">//// ehdr</span>
-<span id="L57" class="LineNr"> 57 </span>  <span class="Comment">// e_ident</span>
-<span id="L58" class="LineNr"> 58 </span>  O<span class="Delimiter">(</span><span class="Constant">0x7f</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">E</span><span class="Comment">*/</span><span class="Constant">0x45</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">L</span><span class="Comment">*/</span><span class="Constant">0x4c</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">F</span><span class="Comment">*/</span><span class="Constant">0x46</span><span class="Delimiter">);</span>
-<span id="L59" class="LineNr"> 59 </span>    O<span class="Delimiter">(</span><span class="Constant">0x1</span><span class="Delimiter">);</span>  <span class="Comment">// 32-bit format</span>
-<span id="L60" class="LineNr"> 60 </span>    O<span class="Delimiter">(</span><span class="Constant">0x1</span><span class="Delimiter">);</span>  <span class="Comment">// little-endian</span>
-<span id="L61" class="LineNr"> 61 </span>    O<span class="Delimiter">(</span><span class="Constant">0x1</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x0</span><span class="Delimiter">);</span>
-<span id="L62" class="LineNr"> 62 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <span class="Constant">8</span><span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> O<span class="Delimiter">(</span><span class="Constant">0x0</span><span class="Delimiter">);</span> <span class="Delimiter">}</span>
-<span id="L63" class="LineNr"> 63 </span>  <span class="Comment">// e_type</span>
-<span id="L64" class="LineNr"> 64 </span>  O<span class="Delimiter">(</span><span class="Constant">0x02</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L65" class="LineNr"> 65 </span>  <span class="Comment">// e_machine</span>
-<span id="L66" class="LineNr"> 66 </span>  O<span class="Delimiter">(</span><span class="Constant">0x03</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L67" class="LineNr"> 67 </span>  <span class="Comment">// e_version</span>
-<span id="L68" class="LineNr"> 68 </span>  O<span class="Delimiter">(</span><span class="Constant">0x01</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L69" class="LineNr"> 69 </span>  <span class="Comment">// e_entry</span>
-<span id="L70" class="LineNr"> 70 </span>  <span class="Normal">int</span> e_entry = p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>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#L103'>start</a><span class="Delimiter">;</span>  <span class="Comment">// convention</span>
-<span id="L71" class="LineNr"> 71 </span>  emit<span class="Delimiter">(</span>e_entry<span class="Delimiter">);</span>
-<span id="L72" class="LineNr"> 72 </span>  <span class="Comment">// e_phoff -- immediately after ELF header</span>
-<span id="L73" class="LineNr"> 73 </span>  <span class="Normal">int</span> e_phoff = <span class="Constant">0x34</span><span class="Delimiter">;</span>
-<span id="L74" class="LineNr"> 74 </span>  emit<span class="Delimiter">(</span>e_phoff<span class="Delimiter">);</span>
-<span id="L75" class="LineNr"> 75 </span>  <span class="Comment">// e_shoff; unused</span>
-<span id="L76" class="LineNr"> 76 </span>  <span class="Normal">int</span> dummy32 = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L77" class="LineNr"> 77 </span>  emit<span class="Delimiter">(</span>dummy32<span class="Delimiter">);</span>
-<span id="L78" class="LineNr"> 78 </span>  <span class="Comment">// e_flags; unused</span>
-<span id="L79" class="LineNr"> 79 </span>  emit<span class="Delimiter">(</span>dummy32<span class="Delimiter">);</span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Comment">// e_ehsize</span>
-<span id="L81" class="LineNr"> 81 </span>  <span class="Normal">uint16_t</span> e_ehsize = <span class="Constant">0x34</span><span class="Delimiter">;</span>
-<span id="L82" class="LineNr"> 82 </span>  emit<span class="Delimiter">(</span>e_ehsize<span class="Delimiter">);</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Comment">// e_phentsize</span>
-<span id="L84" class="LineNr"> 84 </span>  <span class="Normal">uint16_t</span> e_phentsize = <span class="Constant">0x20</span><span class="Delimiter">;</span>
-<span id="L85" class="LineNr"> 85 </span>  emit<span class="Delimiter">(</span>e_phentsize<span class="Delimiter">);</span>
-<span id="L86" class="LineNr"> 86 </span>  <span class="Comment">// e_phnum</span>
-<span id="L87" class="LineNr"> 87 </span>  <span class="Normal">uint16_t</span> e_phnum = <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">);</span>
-<span id="L88" class="LineNr"> 88 </span>  emit<span class="Delimiter">(</span>e_phnum<span class="Delimiter">);</span>
-<span id="L89" class="LineNr"> 89 </span>  <span class="Comment">// e_shentsize</span>
-<span id="L90" class="LineNr"> 90 </span>  <span class="Normal">uint16_t</span> dummy16 = <span class="Constant">0x0</span><span class="Delimiter">;</span>
-<span id="L91" class="LineNr"> 91 </span>  emit<span class="Delimiter">(</span>dummy16<span class="Delimiter">);</span>
-<span id="L92" class="LineNr"> 92 </span>  <span class="Comment">// e_shnum</span>
-<span id="L93" class="LineNr"> 93 </span>  emit<span class="Delimiter">(</span>dummy16<span class="Delimiter">);</span>
-<span id="L94" class="LineNr"> 94 </span>  <span class="Comment">// e_shstrndx</span>
-<span id="L95" class="LineNr"> 95 </span>  emit<span class="Delimiter">(</span>dummy16<span class="Delimiter">);</span>
-<span id="L96" class="LineNr"> 96 </span>
-<span id="L97" class="LineNr"> 97 </span>  <span class="Normal">uint32_t</span> p_offset = <span class="Comment">/*</span><span class="Comment">size of ehdr</span><span class="Comment">*/</span><span class="Constant">0x34</span> + <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">)</span>*<span class="Constant">0x20</span><span class="Comment">/*</span><span class="Comment">size of each phdr</span><span class="Comment">*/</span><span class="Delimiter">;</span>
-<span id="L98" class="LineNr"> 98 </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#L95'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L99" class="LineNr"> 99 </span>    <span class="SalientComment">//// phdr</span>
-<span id="L100" class="LineNr">100 </span>    <span class="Comment">// p_type</span>
-<span id="L101" class="LineNr">101 </span>    <span class="Normal">uint32_t</span> p_type = <span class="Constant">0x1</span><span class="Delimiter">;</span>
-<span id="L102" class="LineNr">102 </span>    emit<span class="Delimiter">(</span>p_type<span class="Delimiter">);</span>
-<span id="L103" class="LineNr">103 </span>    <span class="Comment">// p_offset</span>
-<span id="L104" class="LineNr">104 </span>    emit<span class="Delimiter">(</span>p_offset<span class="Delimiter">);</span>
-<span id="L105" class="LineNr">105 </span>    <span class="Comment">// p_vaddr</span>
-<span id="L106" class="LineNr">106 </span>    emit<span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L103'>start</a><span class="Delimiter">);</span>
-<span id="L107" class="LineNr">107 </span>    <span class="Comment">// p_paddr</span>
-<span id="L108" class="LineNr">108 </span>    emit<span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L103'>start</a><span class="Delimiter">);</span>
-<span id="L109" class="LineNr">109 </span>    <span class="Comment">// p_filesz</span>
-<span id="L110" class="LineNr">110 </span>    <span class="Normal">uint32_t</span> size = <a href='021translate.cc.html#L154'>size_of</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L111" class="LineNr">111 </span>    assert<span class="Delimiter">(</span>size &lt; <a href='020elf.cc.html#L105'>SEGMENT_SIZE</a><span class="Delimiter">);</span>
-<span id="L112" class="LineNr">112 </span>    emit<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
-<span id="L113" class="LineNr">113 </span>    <span class="Comment">// p_memsz</span>
-<span id="L114" class="LineNr">114 </span>    emit<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
-<span id="L115" class="LineNr">115 </span>    <span class="Comment">// p_flags</span>
-<span id="L116" class="LineNr">116 </span>    <span class="Normal">uint32_t</span> p_flags = <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> ? <span class="Comment">/*</span><span class="Comment">r-x</span><span class="Comment">*/</span><span class="Constant">0x5</span> : <span class="Comment">/*</span><span class="Comment">rw-</span><span class="Comment">*/</span><span class="Constant">0x6</span><span class="Delimiter">;</span>  <span class="Comment">// convention: only first segment is code</span>
-<span id="L117" class="LineNr">117 </span>    emit<span class="Delimiter">(</span>p_flags<span class="Delimiter">);</span>
-<span id="L118" class="LineNr">118 </span>
-<span id="L119" class="LineNr">119 </span>    <span class="Comment">// p_align</span>
-<span id="L120" class="LineNr">120 </span>    <span class="Comment">// &quot;As the system creates or augments a process image, it logically copies</span>
-<span id="L121" class="LineNr">121 </span>    <span class="Comment">// a file's segment to a virtual memory segment.  When—and if— the system</span>
-<span id="L122" class="LineNr">122 </span>    <span class="Comment">// physically reads the file depends on the program's execution behavior,</span>
-<span id="L123" class="LineNr">123 </span>    <span class="Comment">// system load, and so on.  A process does not require a physical page</span>
-<span id="L124" class="LineNr">124 </span>    <span class="Comment">// unless it references the logical page during execution, and processes</span>
-<span id="L125" class="LineNr">125 </span>    <span class="Comment">// commonly leave many pages unreferenced. Therefore delaying physical</span>
-<span id="L126" class="LineNr">126 </span>    <span class="Comment">// reads frequently obviates them, improving system performance. To obtain</span>
-<span id="L127" class="LineNr">127 </span>    <span class="Comment">// this efficiency in practice, executable and shared object files must</span>
-<span id="L128" class="LineNr">128 </span>    <span class="Comment">// have segment images whose file offsets and virtual addresses are</span>
-<span id="L129" class="LineNr">129 </span>    <span class="Comment">// congruent, modulo the page size.&quot; -- <a href="http://refspecs.linuxbase.org/elf/elf.pdf">http://refspecs.linuxbase.org/elf/elf.pdf</a> (page 95)</span>
-<span id="L130" class="LineNr">130 </span>    <span class="Normal">uint32_t</span> p_align = <span class="Constant">0x1000</span><span class="Delimiter">;</span>  <span class="Comment">// default page size on linux</span>
-<span id="L131" class="LineNr">131 </span>    emit<span class="Delimiter">(</span>p_align<span class="Delimiter">);</span>
-<span id="L132" class="LineNr">132 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p_offset % p_align != p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L103'>start</a> % p_align<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L133" class="LineNr">133 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;segment starting at 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L228'>HEXWORD</a> &lt;&lt; p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L103'>start</a> &lt;&lt; <span class="Constant">&quot; is improperly aligned; alignment for p_offset &quot;</span> &lt;&lt; p_offset &lt;&lt; <span class="Constant">&quot; should be &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_offset % p_align<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but is &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L103'>start</a> % p_align<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L134" class="LineNr">134 </span>      <span class="Identifier">return</span><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="Comment">// prepare for next segment</span>
-<span id="L138" class="LineNr">138 </span>    p_offset += size<span class="Delimiter">;</span>
-<span id="L139" class="LineNr">139 </span>  <span class="Delimiter">}</span>
-<span id="L140" class="LineNr">140 </span><span class="Comment">#undef O</span>
-<span id="L141" class="LineNr">141 </span><span class="Comment">#undef emit</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='021translate.cc.html#L144'>write_segment</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L145" class="LineNr">145 </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#L104'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L146" class="LineNr">146 </span>    <span class="Normal">const</span> vector&lt;word&gt;&amp; w = s<span class="Delimiter">.</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">;</span>
-<span id="L147" class="LineNr">147 </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="L148" class="LineNr">148 </span>      <span class="Normal">uint8_t</span> x = <a href='011run.cc.html#L222'>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#L115'>data</a><span class="Delimiter">);</span>  <span class="Comment">// we're done with metadata by this point</span>
-<span id="L149" class="LineNr">149 </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="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><span class="Delimiter">}</span>
-<span id="L153" class="LineNr">153 </span>
-<span id="L154" class="LineNr">154 </span><span class="Normal">uint32_t</span> <a href='021translate.cc.html#L154'>size_of</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L155" class="LineNr">155 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L156" class="LineNr">156 </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#L104'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L157" class="LineNr">157 </span>    sum += <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">);</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Identifier">return</span> sum<span class="Delimiter">;</span>
-<span id="L159" class="LineNr">159 </span><span class="Delimiter">}</span>
-<span id="L160" class="LineNr">160 </span>
-<span id="L161" class="LineNr">161 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L162" class="LineNr">162 </span><span class="Normal">using</span> std::ios<span class="Delimiter">;</span>
-</pre>
-</body>
-</html>
-<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/022check_instruction.cc.html b/html/subx/022check_instruction.cc.html
deleted file mode 100644
index 75d6945a..00000000
--- a/html/subx/022check_instruction.cc.html
+++ /dev/null
@@ -1,750 +0,0 @@
-<!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/022check_instruction.cc</title>
-<meta name="Generator" content="Vim/7.4">
-<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; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.CommentedCode { color: #6c6c6c; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.traceContains { color: #008000; }
-.cSpecial { 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">//: Beginning of &quot;level 2&quot;: tagging bytes with metadata around what field of</span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment">//: an x86 instruction they're for.</span>
-<span id="L3" class="LineNr">  3 </span><span class="Comment">//:</span>
-<span id="L4" class="LineNr">  4 </span><span class="Comment">//: The x86 instruction set is variable-length, and how a byte is interpreted</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment">//: affects later instruction boundaries. A lot of the pain in programming machine code</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment">//: stems from computer and programmer going out of sync on what a byte</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment">//: means. The miscommunication is usually not immediately caught, and</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment">//: metastasizes at runtime into kilobytes of misinterpreted instructions.</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment">//: Tagging bytes with what the programmer expects them to be interpreted as</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment">//: helps the computer catch miscommunication immediately.</span>
-<span id="L11" class="LineNr"> 11 </span><span class="Comment">//:</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Comment">//: This is one way SubX is going to be different from a 'language': we</span>
-<span id="L13" class="LineNr"> 13 </span><span class="Comment">//: typically think of languages as less verbose than machine code. Here we're</span>
-<span id="L14" class="LineNr"> 14 </span><span class="Comment">//: making machine code *more* verbose.</span>
-<span id="L15" class="LineNr"> 15 </span><span class="Comment">//:</span>
-<span id="L16" class="LineNr"> 16 </span><span class="Comment">//: ---</span>
-<span id="L17" class="LineNr"> 17 </span><span class="Comment">//:</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Comment">//: While we're here, we'll also improve a couple of other things:</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Comment">//:</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Comment">//: a) Machine code often packs logically separate operands into bitfields of</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Comment">//: a single byte. We'll start writing out each operand separately, and the</span>
-<span id="L22" class="LineNr"> 22 </span><span class="Comment">//: translator will construct the right bytes out of operands.</span>
-<span id="L23" class="LineNr"> 23 </span><span class="Comment">//:</span>
-<span id="L24" class="LineNr"> 24 </span><span class="Comment">//: SubX now gets still more verbose. What used to be a single byte, say 'c3',</span>
-<span id="L25" class="LineNr"> 25 </span><span class="Comment">//: can now expand to '3/mod 0/subop 3/rm32'.</span>
-<span id="L26" class="LineNr"> 26 </span><span class="Comment">//:</span>
-<span id="L27" class="LineNr"> 27 </span><span class="Comment">//: b) Since each operand is tagged, we can loosen ordering restrictions and</span>
-<span id="L28" class="LineNr"> 28 </span><span class="Comment">//: allow writing out the operands in any order, like keyword arguments.</span>
-<span id="L29" class="LineNr"> 29 </span><span class="Comment">//:</span>
-<span id="L30" class="LineNr"> 30 </span><span class="Comment">//: c) Operand values can be expressed in either decimal or hex (when prefixed</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Comment">//: with '0x'. Raw 2-character hex bytes without the '0x' are only valid when</span>
-<span id="L32" class="LineNr"> 32 </span><span class="Comment">//: tagged without any operand metadata. (This may be a bad idea.)</span>
-<span id="L33" class="LineNr"> 33 </span><span class="Comment">//:</span>
-<span id="L34" class="LineNr"> 34 </span><span class="Comment">//: Coda: the actual opcodes (1-3 bytes) will continue to be at the start of</span>
-<span id="L35" class="LineNr"> 35 </span><span class="Comment">//: each line, in hex, and untagged. The x86 instruction set is a mess, and</span>
-<span id="L36" class="LineNr"> 36 </span><span class="Comment">//: instructions don't admit good names.</span>
-<span id="L37" class="LineNr"> 37 </span>
-<span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Texts&quot;)</span>
-<span id="L39" class="LineNr"> 39 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;instructions&quot;</span><span class="Delimiter">,</span>
-<span id="L40" class="LineNr"> 40 </span>  <span class="Constant">&quot;Each x86 instruction consists of an instruction or opcode and some number</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L41" class="LineNr"> 41 </span>  <span class="Constant">&quot;of operands.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L42" class="LineNr"> 42 </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="L43" class="LineNr"> 43 </span>  <span class="Constant">&quot;any type.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L44" class="LineNr"> 44 </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="L45" class="LineNr"> 45 </span>  <span class="Constant">&quot;The complete list of operand <a href='022check_instruction.cc.html#L481'>types</a>: mod, subop, r32 (register), rm32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L46" class="LineNr"> 46 </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="L47" class="LineNr"> 47 </span>  <span class="Constant">&quot;imm32.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L48" class="LineNr"> 48 </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>
-<span id="L49" class="LineNr"> 49 </span><span class="Delimiter">);</span>
-<span id="L50" class="LineNr"> 50 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Contents&quot;)</span>
-<span id="L51" class="LineNr"> 51 </span>cerr &lt;&lt; <span class="Constant">&quot;  instructions</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L52" class="LineNr"> 52 </span>
-<span id="L53" class="LineNr"> 53 </span><span class="SalientComment">//:: Check for 'syntax errors'; missing or unexpected operands.</span>
-<span id="L54" class="LineNr"> 54 </span>
-<span id="L55" class="LineNr"> 55 </span><span class="Delimiter">:(scenario check_missing_imm8_operand)</span>
-<span id="L56" class="LineNr"> 56 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L57" class="LineNr"> 57 </span>== <span class="Constant">0x1</span>
-<span id="L58" class="LineNr"> 58 </span><span class="Comment"># instruction                     effective address                                           operand     displacement    immediate</span>
-<span id="L59" class="LineNr"> 59 </span><span class="Comment"># op          subop               mod             rm32          base      index     scale     r32</span>
-<span id="L60" class="LineNr"> 60 </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="L61" class="LineNr"> 61 </span>  cd                                                                                                                                        <span class="Comment"># int ??</span>
-<span id="L62" class="LineNr"> 62 </span><span class="traceContains">+error: 'cd' (software interrupt): missing imm8 operand</span>
-<span id="L63" class="LineNr"> 63 </span>
-<span id="L64" class="LineNr"> 64 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L65" class="LineNr"> 65 </span><a href='011run.cc.html#L184'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>check_operands<span class="Delimiter">);</span>
-<span id="L66" class="LineNr"> 66 </span>
-<span id="L67" class="LineNr"> 67 </span><span class="Delimiter">:(code)</span>
-<span id="L68" class="LineNr"> 68 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">const</span><span class="Comment">*/</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L69" class="LineNr"> 69 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check operands&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L70" class="LineNr"> 70 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L71" class="LineNr"> 71 </span>  <span class="Normal">const</span> segment&amp; code = p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L72" class="LineNr"> 72 </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>code<span class="Delimiter">.</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L73" class="LineNr"> 73 </span>    check_operands<span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L74" class="LineNr"> 74 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L208'>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="L75" class="LineNr"> 75 </span>  <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="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="L79" class="LineNr"> 79 </span>  <a href='011run.cc.html#L113'>word</a> op = <a href='022check_instruction.cc.html#L91'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L81" class="LineNr"> 81 </span>    <a href='022check_instruction.cc.html#L562'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L82" class="LineNr"> 82 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Delimiter">}</span>
-<span id="L84" class="LineNr"> 84 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L85" class="LineNr"> 85 </span>    <a href='022check_instruction.cc.html#L535'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L86" class="LineNr"> 86 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L87" class="LineNr"> 87 </span>  <span class="Delimiter">}</span>
-<span id="L88" class="LineNr"> 88 </span>  check_operands<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<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#L113'>word</a> <a href='022check_instruction.cc.html#L91'>preprocess_op</a><span class="Delimiter">(</span><a href='011run.cc.html#L113'>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="L92" class="LineNr"> 92 </span>  op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a> = <a href='022check_instruction.cc.html#L596'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
-<span id="L93" class="LineNr"> 93 </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#L115'>data</a><span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span>
-<span id="L94" class="LineNr"> 94 </span>    op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a> = op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="Identifier">return</span> op<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><span class="Comment">//: To check the operands for an opcode, we'll track the permitted operands</span>
-<span id="L99" class="LineNr"> 99 </span><span class="Comment">//: for each supported opcode in a bitvector. That way we can often compute the</span>
-<span id="L100" class="LineNr">100 </span><span class="Comment">//: bitvector for each instruction's operands and compare it with the expected.</span>
-<span id="L101" class="LineNr">101 </span>
-<span id="L102" class="LineNr">102 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L103" class="LineNr">103 </span><span class="Normal">enum</span> <a href='022check_instruction.cc.html#L103'>operand_type</a> <span class="Delimiter">{</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Comment">// start from the least significant bit</span>
-<span id="L105" class="LineNr">105 </span>  <a href='022check_instruction.cc.html#L105'>MODRM</a><span class="Delimiter">,</span>  <span class="Comment">// more complex, may also involve disp8 or disp32</span>
-<span id="L106" class="LineNr">106 </span>  <a href='022check_instruction.cc.html#L106'>SUBOP</a><span class="Delimiter">,</span>
-<span id="L107" class="LineNr">107 </span>  <a href='022check_instruction.cc.html#L107'>DISP8</a><span class="Delimiter">,</span>
-<span id="L108" class="LineNr">108 </span>  <a href='022check_instruction.cc.html#L108'>DISP16</a><span class="Delimiter">,</span>
-<span id="L109" class="LineNr">109 </span>  <a href='022check_instruction.cc.html#L109'>DISP32</a><span class="Delimiter">,</span>
-<span id="L110" class="LineNr">110 </span>  <a href='022check_instruction.cc.html#L110'>IMM8</a><span class="Delimiter">,</span>
-<span id="L111" class="LineNr">111 </span>  <a href='022check_instruction.cc.html#L111'>IMM32</a><span class="Delimiter">,</span>
-<span id="L112" class="LineNr">112 </span>  <a href='022check_instruction.cc.html#L112'>NUM_OPERAND_TYPES</a>
-<span id="L113" class="LineNr">113 </span><span class="Delimiter">};</span>
-<span id="L114" class="LineNr">114 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L115" class="LineNr">115 </span>vector&lt;string&gt; <a href='022check_instruction.cc.html#L115'>Operand_type_name</a><span class="Delimiter">;</span>
-<span id="L116" class="LineNr">116 </span>map&lt;string<span class="Delimiter">,</span> operand_type&gt; <a href='022check_instruction.cc.html#L116'>Operand_type</a><span class="Delimiter">;</span>
-<span id="L117" class="LineNr">117 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L118" class="LineNr">118 </span><a href='022check_instruction.cc.html#L120'>init_op_types</a><span class="Delimiter">();</span>
-<span id="L119" class="LineNr">119 </span><span class="Delimiter">:(code)</span>
-<span id="L120" class="LineNr">120 </span><span class="Normal">void</span> <a href='022check_instruction.cc.html#L120'>init_op_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L121" class="LineNr">121 </span>  assert<span class="Delimiter">(</span><a href='022check_instruction.cc.html#L112'>NUM_OPERAND_TYPES</a> &lt;= <span class="Comment">/*</span><span class="Comment">bits in a uint8_t</span><span class="Comment">*/</span><span class="Constant">8</span><span class="Delimiter">);</span>
-<span id="L122" class="LineNr">122 </span>  <a href='022check_instruction.cc.html#L115'>Operand_type_name</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><a href='022check_instruction.cc.html#L112'>NUM_OPERAND_TYPES</a><span class="Delimiter">);</span>
-<span id="L123" class="LineNr">123 </span><span class="PreProc">  </span><span class="Comment">#define DEF(type) Operand_type_name.at(type) = tolower(#type), put(Operand_type, tolower(#type), type);</span>
-<span id="L124" class="LineNr">124 </span>  DEF<span class="Delimiter">(</span><a href='022check_instruction.cc.html#L105'>MODRM</a><span class="Delimiter">);</span>
-<span id="L125" class="LineNr">125 </span>  DEF<span class="Delimiter">(</span><a href='022check_instruction.cc.html#L106'>SUBOP</a><span class="Delimiter">);</span>
-<span id="L126" class="LineNr">126 </span>  DEF<span class="Delimiter">(</span><a href='022check_instruction.cc.html#L107'>DISP8</a><span class="Delimiter">);</span>
-<span id="L127" class="LineNr">127 </span>  DEF<span class="Delimiter">(</span><a href='022check_instruction.cc.html#L108'>DISP16</a><span class="Delimiter">);</span>
-<span id="L128" class="LineNr">128 </span>  DEF<span class="Delimiter">(</span><a href='022check_instruction.cc.html#L109'>DISP32</a><span class="Delimiter">);</span>
-<span id="L129" class="LineNr">129 </span>  DEF<span class="Delimiter">(</span><a href='022check_instruction.cc.html#L110'>IMM8</a><span class="Delimiter">);</span>
-<span id="L130" class="LineNr">130 </span>  DEF<span class="Delimiter">(</span><a href='022check_instruction.cc.html#L111'>IMM32</a><span class="Delimiter">);</span>
-<span id="L131" class="LineNr">131 </span><span class="PreProc">  </span><span class="Comment">#undef DEF</span>
-<span id="L132" class="LineNr">132 </span><span class="Delimiter">}</span>
-<span id="L133" class="LineNr">133 </span>
-<span id="L134" class="LineNr">134 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L135" class="LineNr">135 </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='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">;</span>
-<span id="L136" class="LineNr">136 </span><span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='022check_instruction.cc.html#L136'>INVALID_OPERANDS</a> = <span class="Constant">0xff</span><span class="Delimiter">;</span>  <span class="Comment">// no instruction uses all the operand types</span>
-<span id="L137" class="LineNr">137 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L138" class="LineNr">138 </span><a href='022check_instruction.cc.html#L140'>init_permitted_operands</a><span class="Delimiter">();</span>
-<span id="L139" class="LineNr">139 </span><span class="Delimiter">:(code)</span>
-<span id="L140" class="LineNr">140 </span><span class="Normal">void</span> <a href='022check_instruction.cc.html#L140'>init_permitted_operands</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L141" class="LineNr">141 </span>  <span class="SalientComment">//// Class A: just op, no operands</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Comment">// halt</span>
-<span id="L143" class="LineNr">143 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;f4&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L144" class="LineNr">144 </span>  <span class="Comment">// push</span>
-<span id="L145" class="LineNr">145 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L146" class="LineNr">146 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L147" class="LineNr">147 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L148" class="LineNr">148 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L149" class="LineNr">149 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L150" class="LineNr">150 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L151" class="LineNr">151 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L152" class="LineNr">152 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L153" class="LineNr">153 </span>  <span class="Comment">// pop</span>
-<span id="L154" class="LineNr">154 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L155" class="LineNr">155 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L156" class="LineNr">156 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L157" class="LineNr">157 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L158" class="LineNr">158 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L159" class="LineNr">159 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L160" class="LineNr">160 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L161" class="LineNr">161 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L162" class="LineNr">162 </span>  <span class="Comment">// return</span>
-<span id="L163" class="LineNr">163 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L164" class="LineNr">164 </span>
-<span id="L165" class="LineNr">165 </span>  <span class="SalientComment">//// Class B: just op and disp8</span>
-<span id="L166" class="LineNr">166 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L167" class="LineNr">167 </span>  <span class="Comment">//  0     0     0      |0       1     0     0</span>
-<span id="L168" class="LineNr">168 </span>
-<span id="L169" class="LineNr">169 </span>  <span class="Comment">// jump</span>
-<span id="L170" class="LineNr">170 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;eb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L171" class="LineNr">171 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;74&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L172" class="LineNr">172 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;75&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L173" class="LineNr">173 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;7c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L174" class="LineNr">174 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;7d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L175" class="LineNr">175 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;7e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L176" class="LineNr">176 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;7f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L177" class="LineNr">177 </span>
-<span id="L178" class="LineNr">178 </span>  <span class="SalientComment">//// Class C: just op and disp16</span>
-<span id="L179" class="LineNr">179 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L180" class="LineNr">180 </span>  <span class="Comment">//  0     0     0      |1       0     0     0</span>
-<span id="L181" class="LineNr">181 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>  <span class="Comment">// jump</span>
-<span id="L182" class="LineNr">182 </span>
-<span id="L183" class="LineNr">183 </span>  <span class="SalientComment">//// Class D: just op and disp32</span>
-<span id="L184" class="LineNr">184 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L185" class="LineNr">185 </span>  <span class="Comment">//  0     0     1      |0       0     0     0</span>
-<span id="L186" class="LineNr">186 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>  <span class="Comment">// call</span>
-<span id="L187" class="LineNr">187 </span>
-<span id="L188" class="LineNr">188 </span>  <span class="SalientComment">//// Class E: just op and imm8</span>
-<span id="L189" class="LineNr">189 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L190" class="LineNr">190 </span>  <span class="Comment">//  0     1     0      |0       0     0     0</span>
-<span id="L191" class="LineNr">191 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;cd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x20</span><span class="Delimiter">);</span>  <span class="Comment">// software interrupt</span>
-<span id="L192" class="LineNr">192 </span>
-<span id="L193" class="LineNr">193 </span>  <span class="SalientComment">//// Class F: just op and imm32</span>
-<span id="L194" class="LineNr">194 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L195" class="LineNr">195 </span>  <span class="Comment">//  1     0     0      |0       0     0     0</span>
-<span id="L196" class="LineNr">196 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// add</span>
-<span id="L197" class="LineNr">197 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// subtract</span>
-<span id="L198" class="LineNr">198 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// and</span>
-<span id="L199" class="LineNr">199 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// or</span>
-<span id="L200" class="LineNr">200 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// xor</span>
-<span id="L201" class="LineNr">201 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// compare</span>
-<span id="L202" class="LineNr">202 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// push</span>
-<span id="L203" class="LineNr">203 </span>  <span class="Comment">// copy</span>
-<span id="L204" class="LineNr">204 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L205" class="LineNr">205 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L206" class="LineNr">206 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L207" class="LineNr">207 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L208" class="LineNr">208 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L209" class="LineNr">209 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L210" class="LineNr">210 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L211" class="LineNr">211 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L212" class="LineNr">212 </span>
-<span id="L213" class="LineNr">213 </span>  <span class="SalientComment">//// Class M: using ModR/M byte</span>
-<span id="L214" class="LineNr">214 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Comment">//  0     0     0      |0       0     0     1</span>
-<span id="L216" class="LineNr">216 </span>
-<span id="L217" class="LineNr">217 </span>  <span class="Comment">// add</span>
-<span id="L218" class="LineNr">218 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;01&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L219" class="LineNr">219 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;03&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L220" class="LineNr">220 </span>  <span class="Comment">// subtract</span>
-<span id="L221" class="LineNr">221 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;29&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L222" class="LineNr">222 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;2b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L223" class="LineNr">223 </span>  <span class="Comment">// and</span>
-<span id="L224" class="LineNr">224 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L225" class="LineNr">225 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L226" class="LineNr">226 </span>  <span class="Comment">// or</span>
-<span id="L227" class="LineNr">227 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L228" class="LineNr">228 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;0b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L229" class="LineNr">229 </span>  <span class="Comment">// complement</span>
-<span id="L230" class="LineNr">230 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L231" class="LineNr">231 </span>  <span class="Comment">// xor</span>
-<span id="L232" class="LineNr">232 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L233" class="LineNr">233 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;33&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L234" class="LineNr">234 </span>  <span class="Comment">// compare</span>
-<span id="L235" class="LineNr">235 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L236" class="LineNr">236 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L237" class="LineNr">237 </span>  <span class="Comment">// copy</span>
-<span id="L238" class="LineNr">238 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L239" class="LineNr">239 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>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="L240" class="LineNr">240 </span>  <span class="Comment">// swap</span>
-<span id="L241" class="LineNr">241 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>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="L242" class="LineNr">242 </span>  <span class="Comment">// pop</span>
-<span id="L243" class="LineNr">243 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>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="L244" class="LineNr">244 </span>
-<span id="L245" class="LineNr">245 </span>  <span class="SalientComment">//// Class O: op, ModR/M and subop (not r32)</span>
-<span id="L246" class="LineNr">246 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L247" class="LineNr">247 </span>  <span class="Comment">//  0     0     0      |0       0     1     1</span>
-<span id="L248" class="LineNr">248 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>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="L249" class="LineNr">249 </span>
-<span id="L250" class="LineNr">250 </span>  <span class="SalientComment">//// Class N: op, ModR/M and imm32</span>
-<span id="L251" class="LineNr">251 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L252" class="LineNr">252 </span>  <span class="Comment">//  1     0     0      |0       0     0     1</span>
-<span id="L253" class="LineNr">253 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>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="L254" class="LineNr">254 </span>
-<span id="L255" class="LineNr">255 </span>  <span class="SalientComment">//// Class P: op, ModR/M, subop (not r32) and imm32</span>
-<span id="L256" class="LineNr">256 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L257" class="LineNr">257 </span>  <span class="Comment">//  1     0     0      |0       0     1     1</span>
-<span id="L258" class="LineNr">258 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>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="L259" class="LineNr">259 </span>
-<span id="L260" class="LineNr">260 </span>  <span class="Comment">// End Init Permitted Operands</span>
-<span id="L261" class="LineNr">261 </span><span class="Delimiter">}</span>
-<span id="L262" class="LineNr">262 </span>
-<span id="L263" class="LineNr">263 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L264" class="LineNr">264 </span><span class="Comment">#define HAS(bitvector, bit)  ((bitvector) &amp; (1 &lt;&lt; (bit)))</span>
-<span id="L265" class="LineNr">265 </span><span class="Comment">#define SET(bitvector, bit)  ((bitvector) | (1 &lt;&lt; (bit)))</span>
-<span id="L266" class="LineNr">266 </span><span class="Comment">#define CLEAR(bitvector, bit)  ((bitvector) &amp; (~(1 &lt;&lt; (bit))))</span>
-<span id="L267" class="LineNr">267 </span>
-<span id="L268" class="LineNr">268 </span><span class="Delimiter">:(code)</span>
-<span id="L269" class="LineNr">269 </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="L270" class="LineNr">270 </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="L271" class="LineNr">271 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='022check_instruction.cc.html#L135'>Permitted_operands</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">);</span>
-<span id="L272" class="LineNr">272 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='022check_instruction.cc.html#L264'>HAS</a><span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='022check_instruction.cc.html#L105'>MODRM</a><span class="Delimiter">))</span>
-<span id="L273" class="LineNr">273 </span>    <a href='022check_instruction.cc.html#L401'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L274" class="LineNr">274 </span>  <a href='022check_instruction.cc.html#L279'>compare_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <a href='022check_instruction.cc.html#L266'>CLEAR</a><span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='022check_instruction.cc.html#L105'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
-<span id="L275" class="LineNr">275 </span><span class="Delimiter">}</span>
-<span id="L276" class="LineNr">276 </span>
-<span id="L277" class="LineNr">277 </span><span class="Comment">//: Many instructions can be checked just by comparing bitvectors.</span>
-<span id="L278" class="LineNr">278 </span>
-<span id="L279" class="LineNr">279 </span><span class="Normal">void</span> <a href='022check_instruction.cc.html#L279'>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="L280" class="LineNr">280 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='022check_instruction.cc.html#L337'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='022check_instruction.cc.html#L322'>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="L281" class="LineNr">281 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='022check_instruction.cc.html#L313'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<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#L208'>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="L283" class="LineNr">283 </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="L284" class="LineNr">284 </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='022check_instruction.cc.html#L112'>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="L285" class="LineNr">285 </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="L286" class="LineNr">286 </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="L287" class="LineNr">287 </span>    <span class="Normal">const</span> string&amp; optype = <a href='022check_instruction.cc.html#L115'>Operand_type_name</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>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="L289" class="LineNr">289 </span>      <a href='003trace.cc.html#L196'>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='022check_instruction.cc.html#L297'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L290" class="LineNr">290 </span>    <span class="Normal">else</span>
-<span id="L291" class="LineNr">291 </span>      <a href='003trace.cc.html#L196'>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='022check_instruction.cc.html#L297'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L292" class="LineNr">292 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L293" class="LineNr">293 </span>  <span class="Delimiter">}</span>
-<span id="L294" class="LineNr">294 </span>  <span class="Comment">// ignore settings in any unused bits</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>string <a href='022check_instruction.cc.html#L297'>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="L298" class="LineNr">298 </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="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L300" class="LineNr">300 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+get<span class="Delimiter">(</span><a href='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">)</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
-<span id="L301" class="LineNr">301 </span><span class="Delimiter">}</span>
-<span id="L302" class="LineNr">302 </span>
-<span id="L303" class="LineNr">303 </span><span class="Normal">bool</span> <a href='022check_instruction.cc.html#L303'>is_hex_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L304" class="LineNr">304 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='022check_instruction.cc.html#L344'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
-<span id="L305" class="LineNr">305 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span>
-<span id="L307" class="LineNr">307 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">.</span>find_first_not_of<span class="Delimiter">(</span><span class="Constant">&quot;0123456789abcdefABCDEF&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span>
-<span id="L309" class="LineNr">309 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L310" class="LineNr">310 </span>  <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L311" class="LineNr">311 </span><span class="Delimiter">}</span>
-<span id="L312" class="LineNr">312 </span>
-<span id="L313" class="LineNr">313 </span><span class="Normal">uint32_t</span> <a href='022check_instruction.cc.html#L313'>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="L314" class="LineNr">314 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L315" class="LineNr">315 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="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#L109'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L316" class="LineNr">316 </span>    bitvector = bitvector | <a href='022check_instruction.cc.html#L353'>bitvector_for_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L317" class="LineNr">317 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L208'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='022check_instruction.cc.html#L136'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L318" class="LineNr">318 </span>  <span class="Delimiter">}</span>
-<span id="L319" class="LineNr">319 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
-<span id="L320" class="LineNr">320 </span><span class="Delimiter">}</span>
-<span id="L321" class="LineNr">321 </span>
-<span id="L322" class="LineNr">322 </span><span class="Normal">bool</span> <a href='022check_instruction.cc.html#L322'>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="L323" class="LineNr">323 </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#L109'>words</a><span class="Delimiter">)</span> &gt; <a href='022check_instruction.cc.html#L326'>first_operand</a><span class="Delimiter">(</span>inst<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> <a href='022check_instruction.cc.html#L326'>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="L327" class="LineNr">327 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>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#L115'>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="L328" class="LineNr">328 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>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#L115'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L329" class="LineNr">329 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>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#L115'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
-<span id="L330" class="LineNr">330 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
-<span id="L331" class="LineNr">331 </span>    <span class="Normal">else</span>
-<span id="L332" class="LineNr">332 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L333" class="LineNr">333 </span>  <span class="Delimiter">}</span>
-<span id="L334" class="LineNr">334 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L335" class="LineNr">335 </span><span class="Delimiter">}</span>
-<span id="L336" class="LineNr">336 </span>
-<span id="L337" class="LineNr">337 </span><span class="Normal">bool</span> <a href='022check_instruction.cc.html#L337'>all_hex_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L338" class="LineNr">338 </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#L109'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L339" class="LineNr">339 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
-<span id="L340" class="LineNr">340 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L341" class="LineNr">341 </span>  <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L342" class="LineNr">342 </span><span class="Delimiter">}</span>
-<span id="L343" class="LineNr">343 </span>
-<span id="L344" class="LineNr">344 </span><span class="Normal">bool</span> <a href='022check_instruction.cc.html#L344'>contains_any_operand_metadata</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; <a href='011run.cc.html#L113'>word</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L345" class="LineNr">345 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='011run.cc.html#L113'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L346" class="LineNr">346 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='022check_instruction.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='011run.cc.html#L113'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> != <a href='022check_instruction.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">())</span>
-<span id="L347" class="LineNr">347 </span>      <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L348" class="LineNr">348 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L349" class="LineNr">349 </span><span class="Delimiter">}</span>
-<span id="L350" class="LineNr">350 </span>
-<span id="L351" class="LineNr">351 </span><span class="Comment">// Scan the metadata of 'w' and return the bit corresponding to any operand type.</span>
-<span id="L352" class="LineNr">352 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
-<span id="L353" class="LineNr">353 </span><span class="Normal">uint32_t</span> <a href='022check_instruction.cc.html#L353'>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="L354" class="LineNr">354 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L355" class="LineNr">355 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L356" class="LineNr">356 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='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="L357" class="LineNr">357 </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="L358" class="LineNr">358 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='022check_instruction.cc.html#L116'>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="L359" class="LineNr">359 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L360" class="LineNr">360 </span>      <a href='003trace.cc.html#L196'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L361" class="LineNr">361 </span>      <span class="Identifier">return</span> <a href='022check_instruction.cc.html#L136'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
-<span id="L362" class="LineNr">362 </span>    <span class="Delimiter">}</span>
-<span id="L363" class="LineNr">363 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><a href='022check_instruction.cc.html#L116'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">));</span>
-<span id="L364" class="LineNr">364 </span>    found =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L365" class="LineNr">365 </span>  <span class="Delimiter">}</span>
-<span id="L366" class="LineNr">366 </span>  <span class="Identifier">return</span> bv<span class="Delimiter">;</span>
-<span id="L367" class="LineNr">367 </span><span class="Delimiter">}</span>
-<span id="L368" class="LineNr">368 </span>
-<span id="L369" class="LineNr">369 </span><span class="Delimiter">:(scenario conflicting_operand_type)</span>
-<span id="L370" class="LineNr">370 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L371" class="LineNr">371 </span>== <span class="Constant">0x1</span>
-<span id="L372" class="LineNr">372 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
-<span id="L373" class="LineNr">373 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
-<span id="L374" class="LineNr">374 </span>
-<span id="L375" class="LineNr">375 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
-<span id="L376" class="LineNr">376 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
-<span id="L377" class="LineNr">377 </span>
-<span id="L378" class="LineNr">378 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
-<span id="L379" class="LineNr">379 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L380" class="LineNr">380 </span>== <span class="Constant">0x1</span>
-<span id="L381" class="LineNr">381 </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="L382" class="LineNr">382 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with <a href='011run.cc.html#L253'>imm32</a> based on subop): missing mod operand</span>
-<span id="L383" class="LineNr">383 </span>
-<span id="L384" class="LineNr">384 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L385" class="LineNr">385 </span>set&lt;string&gt; <a href='022check_instruction.cc.html#L385'>Instruction_operands</a><span class="Delimiter">;</span>
-<span id="L386" class="LineNr">386 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L387" class="LineNr">387 </span><a href='022check_instruction.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;subop&quot;</span><span class="Delimiter">);</span>
-<span id="L388" class="LineNr">388 </span><a href='022check_instruction.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;mod&quot;</span><span class="Delimiter">);</span>
-<span id="L389" class="LineNr">389 </span><a href='022check_instruction.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L390" class="LineNr">390 </span><a href='022check_instruction.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;base&quot;</span><span class="Delimiter">);</span>
-<span id="L391" class="LineNr">391 </span><a href='022check_instruction.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;index&quot;</span><span class="Delimiter">);</span>
-<span id="L392" class="LineNr">392 </span><a href='022check_instruction.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;scale&quot;</span><span class="Delimiter">);</span>
-<span id="L393" class="LineNr">393 </span><a href='022check_instruction.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;r32&quot;</span><span class="Delimiter">);</span>
-<span id="L394" class="LineNr">394 </span><a href='022check_instruction.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">);</span>
-<span id="L395" class="LineNr">395 </span><a href='022check_instruction.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">);</span>
-<span id="L396" class="LineNr">396 </span><a href='022check_instruction.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">);</span>
-<span id="L397" class="LineNr">397 </span><a href='022check_instruction.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">);</span>
-<span id="L398" class="LineNr">398 </span><a href='022check_instruction.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">);</span>
-<span id="L399" class="LineNr">399 </span>
-<span id="L400" class="LineNr">400 </span><span class="Delimiter">:(code)</span>
-<span id="L401" class="LineNr">401 </span><span class="Normal">void</span> <a href='022check_instruction.cc.html#L401'>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="L402" class="LineNr">402 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='022check_instruction.cc.html#L337'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L403" class="LineNr">403 </span>  <a href='022check_instruction.cc.html#L425'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L404" class="LineNr">404 </span>  <a href='022check_instruction.cc.html#L425'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L405" class="LineNr">405 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
-<span id="L406" class="LineNr">406 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a> == <span class="Constant">&quot;81&quot;</span> || op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a> == <span class="Constant">&quot;8f&quot;</span> || op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>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="L407" class="LineNr">407 </span>    <a href='022check_instruction.cc.html#L425'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L408" class="LineNr">408 </span>    <a href='022check_instruction.cc.html#L430'>check_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;should be replaced by subop&quot;</span><span class="Delimiter">);</span>
-<span id="L409" class="LineNr">409 </span>  <span class="Delimiter">}</span>
-<span id="L410" class="LineNr">410 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L208'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L411" class="LineNr">411 </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#L115'>data</a> != <span class="Constant">&quot;4&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L412" class="LineNr">412 </span>  <span class="Comment">// SIB byte checks</span>
-<span id="L413" class="LineNr">413 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L222'>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#L115'>data</a><span class="Delimiter">);</span>
-<span id="L414" class="LineNr">414 </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="L415" class="LineNr">415 </span>    <a href='022check_instruction.cc.html#L425'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L416" class="LineNr">416 </span>    <a href='022check_instruction.cc.html#L425'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>  <span class="Comment">// otherwise why go to SIB?</span>
-<span id="L417" class="LineNr">417 </span>  <span class="Delimiter">}</span>
-<span id="L418" class="LineNr">418 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L419" class="LineNr">419 </span>    <a href='022check_instruction.cc.html#L430'>check_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
-<span id="L420" class="LineNr">420 </span>    <a href='022check_instruction.cc.html#L430'>check_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
-<span id="L421" class="LineNr">421 </span>  <span class="Delimiter">}</span>
-<span id="L422" class="LineNr">422 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span>
-<span id="L423" class="LineNr">423 </span><span class="Delimiter">}</span>
-<span id="L424" class="LineNr">424 </span>
-<span id="L425" class="LineNr">425 </span><span class="Normal">void</span> <a href='022check_instruction.cc.html#L425'>check_metadata_present</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L426" class="LineNr">426 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
-<span id="L427" class="LineNr">427 </span>    <a href='003trace.cc.html#L196'>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='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L428" class="LineNr">428 </span><span class="Delimiter">}</span>
-<span id="L429" class="LineNr">429 </span>
-<span id="L430" class="LineNr">430 </span><span class="Normal">void</span> <a href='022check_instruction.cc.html#L430'>check_metadata_absent</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; msg<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L431" class="LineNr">431 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
-<span id="L432" class="LineNr">432 </span>    <a href='003trace.cc.html#L196'>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='010vm.cc.html#L196'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L433" class="LineNr">433 </span><span class="Delimiter">}</span>
-<span id="L434" class="LineNr">434 </span>
-<span id="L435" class="LineNr">435 </span><span class="Normal">bool</span> has_metadata<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L436" class="LineNr">436 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L437" class="LineNr">437 </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#L109'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L438" class="LineNr">438 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L439" class="LineNr">439 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L440" class="LineNr">440 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' has conflicting &quot;</span> &lt;&lt; m &lt;&lt; <span class="Constant">&quot; operands</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L441" class="LineNr">441 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L442" class="LineNr">442 </span>    <span class="Delimiter">}</span>
-<span id="L443" class="LineNr">443 </span>    result =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L444" class="LineNr">444 </span>  <span class="Delimiter">}</span>
-<span id="L445" class="LineNr">445 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L446" class="LineNr">446 </span><span class="Delimiter">}</span>
-<span id="L447" class="LineNr">447 </span>
-<span id="L448" class="LineNr">448 </span><span class="Normal">bool</span> has_metadata<span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L449" class="LineNr">449 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L450" class="LineNr">450 </span>  <span class="Normal">bool</span> metadata_found =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L451" class="LineNr">451 </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="L452" class="LineNr">452 </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="L453" class="LineNr">453 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='022check_instruction.cc.html#L385'>Instruction_operands</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="L454" class="LineNr">454 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>metadata_found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L455" class="LineNr">455 </span>      <a href='003trace.cc.html#L196'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L456" class="LineNr">456 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L457" class="LineNr">457 </span>    <span class="Delimiter">}</span>
-<span id="L458" class="LineNr">458 </span>    metadata_found =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L459" class="LineNr">459 </span>    result = <span class="Delimiter">(</span>curr == m<span class="Delimiter">);</span>
-<span id="L460" class="LineNr">460 </span>  <span class="Delimiter">}</span>
-<span id="L461" class="LineNr">461 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L462" class="LineNr">462 </span><span class="Delimiter">}</span>
-<span id="L463" class="LineNr">463 </span>
-<span id="L464" class="LineNr">464 </span><a href='011run.cc.html#L113'>word</a> metadata<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L465" class="LineNr">465 </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#L109'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L466" class="LineNr">466 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span>
-<span id="L467" class="LineNr">467 </span>      <span class="Identifier">return</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L468" class="LineNr">468 </span>  assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
-<span id="L469" class="LineNr">469 </span><span class="Delimiter">}</span>
-<span id="L470" class="LineNr">470 </span>
-<span id="L471" class="LineNr">471 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
-<span id="L472" class="LineNr">472 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L473" class="LineNr">473 </span>== <span class="Constant">0x1</span>
-<span id="L474" class="LineNr">474 </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="L475" class="LineNr">475 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
-<span id="L476" class="LineNr">476 </span>
-<span id="L477" class="LineNr">477 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
-<span id="L478" class="LineNr">478 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L479" class="LineNr">479 </span>== <span class="Constant">0x1</span>
-<span id="L480" class="LineNr">480 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/r32
-<span id="L481" class="LineNr">481 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
-<span id="L482" class="LineNr">482 </span>
-<span id="L483" class="LineNr">483 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
-<span id="L484" class="LineNr">484 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L485" class="LineNr">485 </span>== <span class="Constant">0x1</span>
-<span id="L486" class="LineNr">486 </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="L487" class="LineNr">487 </span><span class="traceContains">+error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with <a href='011run.cc.html#L253'>imm32</a> based on subop): missing rm32 operand</span>
-<span id="L488" class="LineNr">488 </span>
-<span id="L489" class="LineNr">489 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
-<span id="L490" class="LineNr">490 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L491" class="LineNr">491 </span>== <span class="Constant">0x1</span>
-<span id="L492" class="LineNr">492 </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="L493" class="LineNr">493 </span><span class="traceContains">+error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with <a href='011run.cc.html#L253'>imm32</a> based on subop): missing subop operand</span>
-<span id="L494" class="LineNr">494 </span>
-<span id="L495" class="LineNr">495 </span><span class="Delimiter">:(scenario check_missing_base_operand)</span>
-<span id="L496" class="LineNr">496 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L497" class="LineNr">497 </span>== <span class="Constant">0x1</span>
-<span id="L498" class="LineNr">498 </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="L499" class="LineNr">499 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with <a href='011run.cc.html#L253'>imm32</a> based on subop): missing base operand</span>
-<span id="L500" class="LineNr">500 </span>
-<span id="L501" class="LineNr">501 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
-<span id="L502" class="LineNr">502 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L503" class="LineNr">503 </span>== <span class="Constant">0x1</span>
-<span id="L504" class="LineNr">504 </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="L505" class="LineNr">505 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32' (combine rm32 with <a href='011run.cc.html#L253'>imm32</a> based on subop): missing index operand</span>
-<span id="L506" class="LineNr">506 </span>
-<span id="L507" class="LineNr">507 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</span>
-<span id="L508" class="LineNr">508 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L509" class="LineNr">509 </span>== <span class="Constant">0x1</span>
-<span id="L510" class="LineNr">510 </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="L511" class="LineNr">511 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32' (combine rm32 with <a href='011run.cc.html#L253'>imm32</a> based on subop): missing base operand</span>
-<span id="L512" class="LineNr">512 </span>
-<span id="L513" class="LineNr">513 </span><span class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
-<span id="L514" class="LineNr">514 </span>== <span class="Constant">0x1</span>
-<span id="L515" class="LineNr">515 </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="L516" class="LineNr">516 </span>$error: <span class="Constant">0</span>
-<span id="L517" class="LineNr">517 </span>
-<span id="L518" class="LineNr">518 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
-<span id="L519" class="LineNr">519 </span>
-<span id="L520" class="LineNr">520 </span><span class="Delimiter">:(code)</span>
-<span id="L521" class="LineNr">521 </span><span class="Normal">void</span> <a href='022check_instruction.cc.html#L562'>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="L522" class="LineNr">522 </span>  assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>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#L115'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
-<span id="L523" class="LineNr">523 </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#L109'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L524" class="LineNr">524 </span>    <a href='003trace.cc.html#L196'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L525" class="LineNr">525 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L526" class="LineNr">526 </span>  <span class="Delimiter">}</span>
-<span id="L527" class="LineNr">527 </span>  <a href='011run.cc.html#L113'>word</a> op = <a href='022check_instruction.cc.html#L91'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
-<span id="L528" class="LineNr">528 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010vm.cc.html#L197'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L529" class="LineNr">529 </span>    <a href='003trace.cc.html#L196'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L530" class="LineNr">530 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L531" class="LineNr">531 </span>  <span class="Delimiter">}</span>
-<span id="L532" class="LineNr">532 </span>  <a href='022check_instruction.cc.html#L562'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L533" class="LineNr">533 </span><span class="Delimiter">}</span>
-<span id="L534" class="LineNr">534 </span>
-<span id="L535" class="LineNr">535 </span><span class="Normal">void</span> <a href='022check_instruction.cc.html#L535'>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="L536" class="LineNr">536 </span>  <a href='003trace.cc.html#L196'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L537" class="LineNr">537 </span><span class="Delimiter">}</span>
-<span id="L538" class="LineNr">538 </span>
-<span id="L539" class="LineNr">539 </span><span class="Delimiter">:(scenario check_missing_disp16_operand)</span>
-<span id="L540" class="LineNr">540 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L541" class="LineNr">541 </span>== <span class="Constant">0x1</span>
-<span id="L542" class="LineNr">542 </span><span class="Comment"># instruction                     effective address                                           operand     displacement    immediate</span>
-<span id="L543" class="LineNr">543 </span><span class="Comment"># op          subop               mod             rm32          base      index     scale     r32</span>
-<span id="L544" class="LineNr">544 </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="L545" class="LineNr">545 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                     <span class="Comment"># jmp if ZF to ??</span>
-<span id="L546" class="LineNr">546 </span><span class="traceContains">+error: '0f 84' (jump disp16 bytes away if ZF is set): missing disp16 operand</span>
-<span id="L547" class="LineNr">547 </span>
-<span id="L548" class="LineNr">548 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L549" class="LineNr">549 </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='022check_instruction.cc.html#L549'>Permitted_operands_0f</a><span class="Delimiter">;</span>
-<span id="L550" class="LineNr">550 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
-<span id="L551" class="LineNr">551 </span><span class="SalientComment">//// Class C: just op and disp16</span>
-<span id="L552" class="LineNr">552 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L553" class="LineNr">553 </span><span class="Comment">//  0     0     0      |1       0     0     0</span>
-<span id="L554" class="LineNr">554 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L549'>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="L555" class="LineNr">555 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L549'>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="L556" class="LineNr">556 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L549'>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="L557" class="LineNr">557 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L549'>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="L558" class="LineNr">558 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L549'>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="L559" class="LineNr">559 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='022check_instruction.cc.html#L549'>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="L560" class="LineNr">560 </span>
-<span id="L561" class="LineNr">561 </span><span class="Delimiter">:(code)</span>
-<span id="L562" class="LineNr">562 </span><span class="Normal">void</span> <a href='022check_instruction.cc.html#L562'>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="L563" class="LineNr">563 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='022check_instruction.cc.html#L549'>Permitted_operands_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">);</span>
-<span id="L564" class="LineNr">564 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='022check_instruction.cc.html#L264'>HAS</a><span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='022check_instruction.cc.html#L105'>MODRM</a><span class="Delimiter">))</span>
-<span id="L565" class="LineNr">565 </span>    <a href='022check_instruction.cc.html#L401'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L566" class="LineNr">566 </span>  <a href='022check_instruction.cc.html#L569'>compare_bitvector_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <a href='022check_instruction.cc.html#L266'>CLEAR</a><span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='022check_instruction.cc.html#L105'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
-<span id="L567" class="LineNr">567 </span><span class="Delimiter">}</span>
-<span id="L568" class="LineNr">568 </span>
-<span id="L569" class="LineNr">569 </span><span class="Normal">void</span> <a href='022check_instruction.cc.html#L569'>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="L570" class="LineNr">570 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='022check_instruction.cc.html#L337'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='022check_instruction.cc.html#L322'>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="L571" class="LineNr">571 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='022check_instruction.cc.html#L313'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L572" class="LineNr">572 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L208'>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="L573" class="LineNr">573 </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="L574" class="LineNr">574 </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='022check_instruction.cc.html#L112'>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="L575" class="LineNr">575 </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="L576" class="LineNr">576 </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="L577" class="LineNr">577 </span>    <span class="Normal">const</span> string&amp; optype = <a href='022check_instruction.cc.html#L115'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L578" class="LineNr">578 </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="L579" class="LineNr">579 </span>      <a href='003trace.cc.html#L196'>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='010vm.cc.html#L197'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L580" class="LineNr">580 </span>    <span class="Normal">else</span>
-<span id="L581" class="LineNr">581 </span>      <a href='003trace.cc.html#L196'>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='010vm.cc.html#L197'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L115'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L582" class="LineNr">582 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L583" class="LineNr">583 </span>  <span class="Delimiter">}</span>
-<span id="L584" class="LineNr">584 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L585" class="LineNr">585 </span><span class="Delimiter">}</span>
-<span id="L586" class="LineNr">586 </span>
-<span id="L587" class="LineNr">587 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L588" class="LineNr">588 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L589" class="LineNr">589 </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#L109'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L590" class="LineNr">590 </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="L591" class="LineNr">591 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L114'>original</a><span class="Delimiter">;</span>
-<span id="L592" class="LineNr">592 </span>  <span class="Delimiter">}</span>
-<span id="L593" class="LineNr">593 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L594" class="LineNr">594 </span><span class="Delimiter">}</span>
-<span id="L595" class="LineNr">595 </span>
-<span id="L596" class="LineNr">596 </span>string <a href='022check_instruction.cc.html#L596'>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="L597" class="LineNr">597 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L598" class="LineNr">598 </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="L599" class="LineNr">599 </span>    out &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">char</span>&gt;<span class="Delimiter">(</span><a href='022check_instruction.cc.html#L596'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
-<span id="L600" class="LineNr">600 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L601" class="LineNr">601 </span><span class="Delimiter">}</span>
-<span id="L602" class="LineNr">602 </span>
-<span id="L603" class="LineNr">603 </span><span class="SalientComment">//:: docs on each operand type</span>
-<span id="L604" class="LineNr">604 </span>
-<span id="L605" class="LineNr">605 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Texts&quot;)</span>
-<span id="L606" class="LineNr">606 </span><a href='022check_instruction.cc.html#L608'>init_operand_type_help</a><span class="Delimiter">();</span>
-<span id="L607" class="LineNr">607 </span><span class="Delimiter">:(code)</span>
-<span id="L608" class="LineNr">608 </span><span class="Normal">void</span> <a href='022check_instruction.cc.html#L608'>init_operand_type_help</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L609" class="LineNr">609 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span>
-<span id="L610" class="LineNr">610 </span>    <span class="Constant">&quot;2-bit operand controlling the _addressing mode_ of many instructions,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L611" class="LineNr">611 </span>    <span class="Constant">&quot;to determine how to compute the _effective address_ to look up memory at</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L612" class="LineNr">612 </span>    <span class="Constant">&quot;based on the 'rm32' operand and potentially others.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L613" class="LineNr">613 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L614" class="LineNr">614 </span>    <span class="Constant">&quot;If mod = 3, just operate on the <a href='003trace.cc.html#L74'>contents</a> of the register specified by rm32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L615" class="LineNr">615 </span>    <span class="Constant">&quot;            (direct mode).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L616" class="LineNr">616 </span>    <span class="Constant">&quot;If mod = 2, effective address is usually* rm32 + disp32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L617" class="LineNr">617 </span>    <span class="Constant">&quot;            (indirect mode with displacement).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L618" class="LineNr">618 </span>    <span class="Constant">&quot;If mod = 1, effective address is usually* rm32 + disp8</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L619" class="LineNr">619 </span>    <span class="Constant">&quot;            (indirect mode with displacement).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L620" class="LineNr">620 </span>    <span class="Constant">&quot;If mod = 0, effective address is usually* rm32 (indirect mode).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L621" class="LineNr">621 </span>    <span class="Constant">&quot;(* - The exception is when rm32 is '4'. Register 4 is the stack pointer (ESP).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L622" class="LineNr">622 </span>    <span class="Constant">&quot;     Using it as an address gets more involved. For more details,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L623" class="LineNr">623 </span>    <span class="Constant">&quot;     try reading the help pages for 'base', 'index' and 'scale'.)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L624" class="LineNr">624 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L625" class="LineNr">625 </span>    <span class="Constant">&quot;For complete details consult the IA-32 software developer's manual, table 2-2,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L626" class="LineNr">626 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing forms with the ModR/M byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L627" class="LineNr">627 </span>    <span class="Constant">&quot;  <a href="https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf">https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L628" class="LineNr">628 </span>  <span class="Delimiter">);</span>
-<span id="L629" class="LineNr">629 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span>
-<span id="L630" class="LineNr">630 </span>    <span class="Constant">&quot;Additional 3-bit operand for determining the instruction when the opcode is 81, 8f or ff.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L631" class="LineNr">631 </span>    <span class="Constant">&quot;Can't coexist with operand of type 'r32' in a single instruction, because the two use the same bits.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L632" class="LineNr">632 </span>  <span class="Delimiter">);</span>
-<span id="L633" class="LineNr">633 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span>
-<span id="L634" class="LineNr">634 </span>    <span class="Constant">&quot;3-bit operand specifying a register operand used directly, without any further addressing modes.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L635" class="LineNr">635 </span>  <span class="Delimiter">);</span>
-<span id="L636" class="LineNr">636 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span>
-<span id="L637" class="LineNr">637 </span>    <span class="Constant">&quot;3-bit operand specifying a register operand whose precise interpretation interacts with 'mod'.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L638" class="LineNr">638 </span>    <span class="Constant">&quot;For complete details consult the IA-32 software developer's manual, table 2-2,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L639" class="LineNr">639 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing forms with the ModR/M byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L640" class="LineNr">640 </span>    <span class="Constant">&quot;  <a href="https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf">https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L641" class="LineNr">641 </span>  <span class="Delimiter">);</span>
-<span id="L642" class="LineNr">642 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span>
-<span id="L643" class="LineNr">643 </span>    <span class="Constant">&quot;Additional 3-bit operand (when 'rm32' is 4 unless 'mod' is 3) specifying the register containing an address to look up.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L644" class="LineNr">644 </span>    <span class="Constant">&quot;This address may be further modified by 'index' and 'scale' operands.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L645" class="LineNr">645 </span>    <span class="Constant">&quot;  effective address = base + index*scale + displacement (disp8 or disp32)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L646" class="LineNr">646 </span>    <span class="Constant">&quot;For complete details consult the IA-32 software developer's manual, table 2-3,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L647" class="LineNr">647 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing forms with the SIB byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L648" class="LineNr">648 </span>    <span class="Constant">&quot;  <a href="https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf">https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L649" class="LineNr">649 </span>  <span class="Delimiter">);</span>
-<span id="L650" class="LineNr">650 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span>
-<span id="L651" class="LineNr">651 </span>    <span class="Constant">&quot;Optional 3-bit operand (when 'rm32' is 4 unless 'mod' is 3) that can be added to the 'base' operand to compute the 'effective address' at which to look up memory.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L652" class="LineNr">652 </span>    <span class="Constant">&quot;  effective address = base + index*scale + displacement (disp8 or disp32)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L653" class="LineNr">653 </span>    <span class="Constant">&quot;For complete details consult the IA-32 software developer's manual, table 2-3,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L654" class="LineNr">654 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing forms with the SIB byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L655" class="LineNr">655 </span>    <span class="Constant">&quot;  <a href="https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf">https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L656" class="LineNr">656 </span>  <span class="Delimiter">);</span>
-<span id="L657" class="LineNr">657 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;scale&quot;</span><span class="Delimiter">,</span>
-<span id="L658" class="LineNr">658 </span>    <span class="Constant">&quot;Optional 2-bit operand (when 'rm32' is 4 unless 'mod' is 3) that can be multiplied to the 'index' operand before adding the result to the 'base' operand to compute the _effective address_ to operate on.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L659" class="LineNr">659 </span>    <span class="Constant">&quot;  effective address = base + index * scale + displacement (disp8 or disp32)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L660" class="LineNr">660 </span>    <span class="Constant">&quot;For complete details consult the IA-32 software developer's manual, table 2-3,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L661" class="LineNr">661 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing forms with the SIB byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L662" class="LineNr">662 </span>    <span class="Constant">&quot;  <a href="https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf">https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L663" class="LineNr">663 </span>  <span class="Delimiter">);</span>
-<span id="L664" class="LineNr">664 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">,</span>
-<span id="L665" class="LineNr">665 </span>    <span class="Constant">&quot;8-bit value to be added in many instructions.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L666" class="LineNr">666 </span>  <span class="Delimiter">);</span>
-<span id="L667" class="LineNr">667 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">,</span>
-<span id="L668" class="LineNr">668 </span>    <span class="Constant">&quot;16-bit value to be added in many instructions.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L669" class="LineNr">669 </span>  <span class="Delimiter">);</span>
-<span id="L670" class="LineNr">670 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">,</span>
-<span id="L671" class="LineNr">671 </span>    <span class="Constant">&quot;32-bit value to be added in many instructions.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L672" class="LineNr">672 </span>  <span class="Delimiter">);</span>
-<span id="L673" class="LineNr">673 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">,</span>
-<span id="L674" class="LineNr">674 </span>    <span class="Constant">&quot;8-bit value for many instructions.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L675" class="LineNr">675 </span>  <span class="Delimiter">);</span>
-<span id="L676" class="LineNr">676 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">,</span>
-<span id="L677" class="LineNr">677 </span>    <span class="Constant">&quot;32-bit value for many instructions.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L678" class="LineNr">678 </span>  <span class="Delimiter">);</span>
-<span id="L679" class="LineNr">679 </span><span class="Delimiter">}</span>
-<span id="L680" class="LineNr">680 </span>
-<span id="L681" class="LineNr">681 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L682" class="LineNr">682 </span><span class="Comment">#include&lt;cctype&gt;</span>
-</pre>
-</body>
-</html>
-<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/029translate.cc.html b/html/subx/029translate.cc.html
new file mode 100644
index 00000000..53e77fa0
--- /dev/null
+++ b/html/subx/029translate.cc.html
@@ -0,0 +1,288 @@
+<!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/029translate.cc</title>
+<meta name="Generator" content="Vim/7.4">
+<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; }
+.Constant { color: #00a0a0; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.cSpecial { color: #008000; }
+-->
+</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">//: The bedrock level 1 of abstraction is now done, and we're going to start</span>
+<span id="L2" class="LineNr">  2 </span><span class="Comment">//: building levels above it that make programming in x86 machine code a</span>
+<span id="L3" class="LineNr">  3 </span><span class="Comment">//: little more ergonomic.</span>
+<span id="L4" class="LineNr">  4 </span><span class="Comment">//:</span>
+<span id="L5" class="LineNr">  5 </span><span class="Comment">//: All levels will be &quot;pass through by default&quot;. Whatever they don't</span>
+<span id="L6" class="LineNr">  6 </span><span class="Comment">//: understand they will silently pass through to lower levels.</span>
+<span id="L7" class="LineNr">  7 </span><span class="Comment">//:</span>
+<span id="L8" class="LineNr">  8 </span><span class="Comment">//: Since raw hex bytes of machine code are always possible to inject, SubX is</span>
+<span id="L9" class="LineNr">  9 </span><span class="Comment">//: not a language, and we aren't building a compiler. This is something</span>
+<span id="L10" class="LineNr"> 10 </span><span class="Comment">//: deliberately leakier. Levels are more for improving auditing, checks and</span>
+<span id="L11" class="LineNr"> 11 </span><span class="Comment">//: error messages rather than for hiding low-level details.</span>
+<span id="L12" class="LineNr"> 12 </span>
+<span id="L13" class="LineNr"> 13 </span><span class="Comment">//: Translator workflow: read 'source' file. Run a series of transforms on it,</span>
+<span id="L14" class="LineNr"> 14 </span><span class="Comment">//: each passing through what it doesn't understand. The final program should</span>
+<span id="L15" class="LineNr"> 15 </span><span class="Comment">//: be just machine code, suitable to write to an ELF binary.</span>
+<span id="L16" class="LineNr"> 16 </span><span class="Comment">//:</span>
+<span id="L17" class="LineNr"> 17 </span><span class="Comment">//: Higher levels usually transform code on the basis of metadata.</span>
+<span id="L18" class="LineNr"> 18 </span>
+<span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Main&quot;)</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;translate&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L238'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span>
+<span id="L22" class="LineNr"> 22 </span>  assert<span class="Delimiter">(</span>argc &gt; <span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L23" class="LineNr"> 23 </span>  <a href='011run.cc.html#L96'>program</a> p<span class="Delimiter">;</span>
+<span id="L24" class="LineNr"> 24 </span>  ifstream fin<span class="Delimiter">(</span>argv[<span class="Constant">2</span>]<span class="Delimiter">);</span>
+<span id="L25" class="LineNr"> 25 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!fin<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L26" class="LineNr"> 26 </span>    cerr &lt;&lt; <span class="Constant">&quot;could not open &quot;</span> &lt;&lt; argv[<span class="Constant">2</span>] &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L27" class="LineNr"> 27 </span>    <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="Delimiter">}</span>
+<span id="L29" class="LineNr"> 29 </span>  <a href='011run.cc.html#L124'>parse</a><span class="Delimiter">(</span>fin<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L210'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L31" class="LineNr"> 31 </span>  transform<span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L210'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L33" class="LineNr"> 33 </span>  <a href='029translate.cc.html#L105'>save_elf</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> argv[<span class="Constant">3</span>]<span class="Delimiter">);</span>
+<span id="L34" class="LineNr"> 34 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L210'>trace_contains_errors</a><span class="Delimiter">())</span> unlink<span class="Delimiter">(</span>argv[<span class="Constant">3</span>]<span class="Delimiter">);</span>
+<span id="L35" class="LineNr"> 35 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L36" class="LineNr"> 36 </span><span class="Delimiter">}</span>
+<span id="L37" class="LineNr"> 37 </span>
+<span id="L38" class="LineNr"> 38 </span><span class="Comment">//: Ordering transforms is a well-known hard problem when building compilers.</span>
+<span id="L39" class="LineNr"> 39 </span><span class="Comment">//: In our case we also have the additional notion of layers. The ordering of</span>
+<span id="L40" class="LineNr"> 40 </span><span class="Comment">//: layers can have nothing in common with the ordering of transforms when</span>
+<span id="L41" class="LineNr"> 41 </span><span class="Comment">//: SubX is tangled and run. This can be confusing for readers, particularly</span>
+<span id="L42" class="LineNr"> 42 </span><span class="Comment">//: if later layers start inserting transforms at arbitrary points between</span>
+<span id="L43" class="LineNr"> 43 </span><span class="Comment">//: transforms introduced earlier. Over time adding transforms can get harder</span>
+<span id="L44" class="LineNr"> 44 </span><span class="Comment">//: and harder, having to meet the constraints of everything that's come</span>
+<span id="L45" class="LineNr"> 45 </span><span class="Comment">//: before. It's worth thinking about organization up-front so the ordering is</span>
+<span id="L46" class="LineNr"> 46 </span><span class="Comment">//: easy to hold in our heads, and it's obvious where to add a new transform.</span>
+<span id="L47" class="LineNr"> 47 </span><span class="Comment">//: Some constraints:</span>
+<span id="L48" class="LineNr"> 48 </span><span class="Comment">//:</span>
+<span id="L49" class="LineNr"> 49 </span><span class="Comment">//:   1. Layers force us to build SubX bottom-up; since we want to be able to</span>
+<span id="L50" class="LineNr"> 50 </span><span class="Comment">//:   build and run SubX after stopping loading at any layer, the overall</span>
+<span id="L51" class="LineNr"> 51 </span><span class="Comment">//:   organization has to be to introduce primitives before we start using</span>
+<span id="L52" class="LineNr"> 52 </span><span class="Comment">//:   them.</span>
+<span id="L53" class="LineNr"> 53 </span><span class="Comment">//:</span>
+<span id="L54" class="LineNr"> 54 </span><span class="Comment">//:   2. Transforms usually need to be run top-down, converting high-level</span>
+<span id="L55" class="LineNr"> 55 </span><span class="Comment">//:   representations to low-level ones so that low-level layers can be</span>
+<span id="L56" class="LineNr"> 56 </span><span class="Comment">//:   oblivious to them.</span>
+<span id="L57" class="LineNr"> 57 </span><span class="Comment">//:</span>
+<span id="L58" class="LineNr"> 58 </span><span class="Comment">//:   3. When running we'd often like new representations to be checked before</span>
+<span id="L59" class="LineNr"> 59 </span><span class="Comment">//:   they are transformed away. The whole reason for new representations is</span>
+<span id="L60" class="LineNr"> 60 </span><span class="Comment">//:   often to add new kinds of automatic checking for our machine code</span>
+<span id="L61" class="LineNr"> 61 </span><span class="Comment">//:   programs.</span>
+<span id="L62" class="LineNr"> 62 </span><span class="Comment">//:</span>
+<span id="L63" class="LineNr"> 63 </span><span class="Comment">//: Putting these constraints together, we'll use the following broad</span>
+<span id="L64" class="LineNr"> 64 </span><span class="Comment">//: organization:</span>
+<span id="L65" class="LineNr"> 65 </span><span class="Comment">//:</span>
+<span id="L66" class="LineNr"> 66 </span><span class="Comment">//:   a) We'll divide up our transforms into &quot;levels&quot;, each level consisting</span>
+<span id="L67" class="LineNr"> 67 </span><span class="Comment">//:   of multiple transforms, and dealing in some new set of representational</span>
+<span id="L68" class="LineNr"> 68 </span><span class="Comment">//:   ideas. Levels will be added in reverse order to the one their transforms</span>
+<span id="L69" class="LineNr"> 69 </span><span class="Comment">//:   will be run in.</span>
+<span id="L70" class="LineNr"> 70 </span><span class="Comment">//:</span>
+<span id="L71" class="LineNr"> 71 </span><span class="Comment">//:     To run all transforms:</span>
+<span id="L72" class="LineNr"> 72 </span><span class="Comment">//:       Load transforms for level n</span>
+<span id="L73" class="LineNr"> 73 </span><span class="Comment">//:       Load transforms for level n-1</span>
+<span id="L74" class="LineNr"> 74 </span><span class="Comment">//:       ...</span>
+<span id="L75" class="LineNr"> 75 </span><span class="Comment">//:       Load transforms for level 2</span>
+<span id="L76" class="LineNr"> 76 </span><span class="Comment">//:       Run code at level 1</span>
+<span id="L77" class="LineNr"> 77 </span><span class="Comment">//:</span>
+<span id="L78" class="LineNr"> 78 </span><span class="Comment">//:   b) *Within* a level we'll usually introduce transforms in the order</span>
+<span id="L79" class="LineNr"> 79 </span><span class="Comment">//:   they're run in.</span>
+<span id="L80" class="LineNr"> 80 </span><span class="Comment">//:</span>
+<span id="L81" class="LineNr"> 81 </span><span class="Comment">//:     To run transforms for level n:</span>
+<span id="L82" class="LineNr"> 82 </span><span class="Comment">//:       Perform transform of layer l</span>
+<span id="L83" class="LineNr"> 83 </span><span class="Comment">//:       Perform transform of layer l+1</span>
+<span id="L84" class="LineNr"> 84 </span><span class="Comment">//:       ...</span>
+<span id="L85" class="LineNr"> 85 </span><span class="Comment">//:</span>
+<span id="L86" class="LineNr"> 86 </span><span class="Comment">//:   c) Within a level it's often most natural to introduce a new</span>
+<span id="L87" class="LineNr"> 87 </span><span class="Comment">//:   representation by showing how it's transformed to the level below. To</span>
+<span id="L88" class="LineNr"> 88 </span><span class="Comment">//:   make such exceptions more obvious checks usually won't be first-class</span>
+<span id="L89" class="LineNr"> 89 </span><span class="Comment">//:   transforms; instead code that keeps the program unmodified will run</span>
+<span id="L90" class="LineNr"> 90 </span><span class="Comment">//:   within transforms before they mutate the program.</span>
+<span id="L91" class="LineNr"> 91 </span><span class="Comment">//:</span>
+<span id="L92" class="LineNr"> 92 </span><span class="Comment">//:     Level l transforms programs</span>
+<span id="L93" class="LineNr"> 93 </span><span class="Comment">//:     Level l+1 inserts checks to run *before* the transform of level l runs</span>
+<span id="L94" class="LineNr"> 94 </span><span class="Comment">//:</span>
+<span id="L95" class="LineNr"> 95 </span><span class="Comment">//: This may all seem abstract, but will hopefully make sense over time. The</span>
+<span id="L96" class="LineNr"> 96 </span><span class="Comment">//: goals are basically to always have a working program after any layer, to</span>
+<span id="L97" class="LineNr"> 97 </span><span class="Comment">//: have the order of layers make narrative sense, and to order transforms</span>
+<span id="L98" class="LineNr"> 98 </span><span class="Comment">//: correctly at runtime.</span>
+<span id="L99" class="LineNr"> 99 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L100" class="LineNr">100 </span><span class="Comment">// Begin Transforms</span>
+<span id="L101" class="LineNr">101 </span><span class="Comment">// End Transforms</span>
+<span id="L102" class="LineNr">102 </span>
+<span id="L103" class="LineNr">103 </span><span class="Delimiter">:(code)</span>
+<span id="L104" class="LineNr">104 </span><span class="Comment">// write out a program to a bare-bones ELF file</span>
+<span id="L105" class="LineNr">105 </span><span class="Normal">void</span> <a href='029translate.cc.html#L105'>save_elf</a><span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">,</span> <span class="Normal">const</span> <span class="Normal">char</span>* filename<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L106" class="LineNr">106 </span>  ofstream out<span class="Delimiter">(</span>filename<span class="Delimiter">,</span> ios::binary<span class="Delimiter">);</span>
+<span id="L107" class="LineNr">107 </span>  <a href='029translate.cc.html#L113'>write_elf_header</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
+<span id="L108" class="LineNr">108 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>size<span class="Delimiter">();</span>  ++i<span class="Delimiter">)</span>
+<span id="L109" class="LineNr">109 </span>    <a href='029translate.cc.html#L206'>write_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> out<span class="Delimiter">);</span>
+<span id="L110" class="LineNr">110 </span>  out<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
+<span id="L111" class="LineNr">111 </span><span class="Delimiter">}</span>
+<span id="L112" class="LineNr">112 </span>
+<span id="L113" class="LineNr">113 </span><span class="Normal">void</span> <a href='029translate.cc.html#L113'>write_elf_header</a><span class="Delimiter">(</span>ostream&amp; out<span class="Delimiter">,</span> <span class="Normal">const</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Normal">char</span> c = <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
+<span id="L115" class="LineNr">115 </span><span class="Comment">#define O(X)  c = (X); out.write(&amp;c, sizeof(c))</span>
+<span id="L116" class="LineNr">116 </span><span class="Comment">// host is required to be little-endian</span>
+<span id="L117" class="LineNr">117 </span><span class="Comment">#define emit(X)  out.write(reinterpret_cast&lt;const char*&gt;(&amp;X), sizeof(X))</span>
+<span id="L118" class="LineNr">118 </span>  <span class="SalientComment">//// ehdr</span>
+<span id="L119" class="LineNr">119 </span>  <span class="Comment">// e_ident</span>
+<span id="L120" class="LineNr">120 </span>  O<span class="Delimiter">(</span><span class="Constant">0x7f</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">E</span><span class="Comment">*/</span><span class="Constant">0x45</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">L</span><span class="Comment">*/</span><span class="Constant">0x4c</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">F</span><span class="Comment">*/</span><span class="Constant">0x46</span><span class="Delimiter">);</span>
+<span id="L121" class="LineNr">121 </span>    O<span class="Delimiter">(</span><span class="Constant">0x1</span><span class="Delimiter">);</span>  <span class="Comment">// 32-bit format</span>
+<span id="L122" class="LineNr">122 </span>    O<span class="Delimiter">(</span><span class="Constant">0x1</span><span class="Delimiter">);</span>  <span class="Comment">// little-endian</span>
+<span id="L123" class="LineNr">123 </span>    O<span class="Delimiter">(</span><span class="Constant">0x1</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x0</span><span class="Delimiter">);</span>
+<span id="L124" class="LineNr">124 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <span class="Constant">8</span><span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> O<span class="Delimiter">(</span><span class="Constant">0x0</span><span class="Delimiter">);</span> <span class="Delimiter">}</span>
+<span id="L125" class="LineNr">125 </span>  <span class="Comment">// e_type</span>
+<span id="L126" class="LineNr">126 </span>  O<span class="Delimiter">(</span><span class="Constant">0x02</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </span>  <span class="Comment">// e_machine</span>
+<span id="L128" class="LineNr">128 </span>  O<span class="Delimiter">(</span><span class="Constant">0x03</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L129" class="LineNr">129 </span>  <span class="Comment">// e_version</span>
+<span id="L130" class="LineNr">130 </span>  O<span class="Delimiter">(</span><span class="Constant">0x01</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L131" class="LineNr">131 </span>  <span class="Comment">// e_entry</span>
+<span id="L132" class="LineNr">132 </span>  <span class="Normal">int</span> e_entry = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>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#L105'>start</a><span class="Delimiter">;</span>  <span class="Comment">// convention</span>
+<span id="L133" class="LineNr">133 </span>  emit<span class="Delimiter">(</span>e_entry<span class="Delimiter">);</span>
+<span id="L134" class="LineNr">134 </span>  <span class="Comment">// e_phoff -- immediately after ELF header</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Normal">int</span> e_phoff = <span class="Constant">0x34</span><span class="Delimiter">;</span>
+<span id="L136" class="LineNr">136 </span>  emit<span class="Delimiter">(</span>e_phoff<span class="Delimiter">);</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Comment">// e_shoff; unused</span>
+<span id="L138" class="LineNr">138 </span>  <span class="Normal">int</span> dummy32 = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L139" class="LineNr">139 </span>  emit<span class="Delimiter">(</span>dummy32<span class="Delimiter">);</span>
+<span id="L140" class="LineNr">140 </span>  <span class="Comment">// e_flags; unused</span>
+<span id="L141" class="LineNr">141 </span>  emit<span class="Delimiter">(</span>dummy32<span class="Delimiter">);</span>
+<span id="L142" class="LineNr">142 </span>  <span class="Comment">// e_ehsize</span>
+<span id="L143" class="LineNr">143 </span>  <span class="Normal">uint16_t</span> e_ehsize = <span class="Constant">0x34</span><span class="Delimiter">;</span>
+<span id="L144" class="LineNr">144 </span>  emit<span class="Delimiter">(</span>e_ehsize<span class="Delimiter">);</span>
+<span id="L145" class="LineNr">145 </span>  <span class="Comment">// e_phentsize</span>
+<span id="L146" class="LineNr">146 </span>  <span class="Normal">uint16_t</span> e_phentsize = <span class="Constant">0x20</span><span class="Delimiter">;</span>
+<span id="L147" class="LineNr">147 </span>  emit<span class="Delimiter">(</span>e_phentsize<span class="Delimiter">);</span>
+<span id="L148" class="LineNr">148 </span>  <span class="Comment">// e_phnum</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Normal">uint16_t</span> e_phnum = <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">);</span>
+<span id="L150" class="LineNr">150 </span>  emit<span class="Delimiter">(</span>e_phnum<span class="Delimiter">);</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Comment">// e_shentsize</span>
+<span id="L152" class="LineNr">152 </span>  <span class="Normal">uint16_t</span> dummy16 = <span class="Constant">0x0</span><span class="Delimiter">;</span>
+<span id="L153" class="LineNr">153 </span>  emit<span class="Delimiter">(</span>dummy16<span class="Delimiter">);</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Comment">// e_shnum</span>
+<span id="L155" class="LineNr">155 </span>  emit<span class="Delimiter">(</span>dummy16<span class="Delimiter">);</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Comment">// e_shstrndx</span>
+<span id="L157" class="LineNr">157 </span>  emit<span class="Delimiter">(</span>dummy16<span class="Delimiter">);</span>
+<span id="L158" class="LineNr">158 </span>
+<span id="L159" class="LineNr">159 </span>  <span class="Normal">uint32_t</span> p_offset = <span class="Comment">/*</span><span class="Comment">size of ehdr</span><span class="Comment">*/</span><span class="Constant">0x34</span> + <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">)</span>*<span class="Constant">0x20</span><span class="Comment">/*</span><span class="Comment">size of each phdr</span><span class="Comment">*/</span><span class="Delimiter">;</span>
+<span id="L160" class="LineNr">160 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L161" class="LineNr">161 </span>    <span class="SalientComment">//// phdr</span>
+<span id="L162" class="LineNr">162 </span>    <span class="Comment">// p_type</span>
+<span id="L163" class="LineNr">163 </span>    <span class="Normal">uint32_t</span> p_type = <span class="Constant">0x1</span><span class="Delimiter">;</span>
+<span id="L164" class="LineNr">164 </span>    emit<span class="Delimiter">(</span>p_type<span class="Delimiter">);</span>
+<span id="L165" class="LineNr">165 </span>    <span class="Comment">// p_offset</span>
+<span id="L166" class="LineNr">166 </span>    emit<span class="Delimiter">(</span>p_offset<span class="Delimiter">);</span>
+<span id="L167" class="LineNr">167 </span>    <span class="Comment">// p_vaddr</span>
+<span id="L168" class="LineNr">168 </span>    emit<span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L105'>start</a><span class="Delimiter">);</span>
+<span id="L169" class="LineNr">169 </span>    <span class="Comment">// p_paddr</span>
+<span id="L170" class="LineNr">170 </span>    emit<span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L105'>start</a><span class="Delimiter">);</span>
+<span id="L171" class="LineNr">171 </span>    <span class="Comment">// p_filesz</span>
+<span id="L172" class="LineNr">172 </span>    <span class="Normal">uint32_t</span> size = <a href='029translate.cc.html#L216'>size_of</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L173" class="LineNr">173 </span>    assert<span class="Delimiter">(</span>size &lt; <a href='012elf.cc.html#L105'>SEGMENT_SIZE</a><span class="Delimiter">);</span>
+<span id="L174" class="LineNr">174 </span>    emit<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
+<span id="L175" class="LineNr">175 </span>    <span class="Comment">// p_memsz</span>
+<span id="L176" class="LineNr">176 </span>    emit<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
+<span id="L177" class="LineNr">177 </span>    <span class="Comment">// p_flags</span>
+<span id="L178" class="LineNr">178 </span>    <span class="Normal">uint32_t</span> p_flags = <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> ? <span class="Comment">/*</span><span class="Comment">r-x</span><span class="Comment">*/</span><span class="Constant">0x5</span> : <span class="Comment">/*</span><span class="Comment">rw-</span><span class="Comment">*/</span><span class="Constant">0x6</span><span class="Delimiter">;</span>  <span class="Comment">// convention: only first segment is code</span>
+<span id="L179" class="LineNr">179 </span>    emit<span class="Delimiter">(</span>p_flags<span class="Delimiter">);</span>
+<span id="L180" class="LineNr">180 </span>
+<span id="L181" class="LineNr">181 </span>    <span class="Comment">// p_align</span>
+<span id="L182" class="LineNr">182 </span>    <span class="Comment">// &quot;As the system creates or augments a process image, it logically copies</span>
+<span id="L183" class="LineNr">183 </span>    <span class="Comment">// a file's segment to a virtual memory segment.  When—and if— the system</span>
+<span id="L184" class="LineNr">184 </span>    <span class="Comment">// physically reads the file depends on the program's execution behavior,</span>
+<span id="L185" class="LineNr">185 </span>    <span class="Comment">// system load, and so on.  A process does not require a physical page</span>
+<span id="L186" class="LineNr">186 </span>    <span class="Comment">// unless it references the logical page during execution, and processes</span>
+<span id="L187" class="LineNr">187 </span>    <span class="Comment">// commonly leave many pages unreferenced. Therefore delaying physical</span>
+<span id="L188" class="LineNr">188 </span>    <span class="Comment">// reads frequently obviates them, improving system performance. To obtain</span>
+<span id="L189" class="LineNr">189 </span>    <span class="Comment">// this efficiency in practice, executable and shared object files must</span>
+<span id="L190" class="LineNr">190 </span>    <span class="Comment">// have segment images whose file offsets and virtual addresses are</span>
+<span id="L191" class="LineNr">191 </span>    <span class="Comment">// congruent, modulo the page size.&quot; -- <a href="http://refspecs.linuxbase.org/elf/elf.pdf">http://refspecs.linuxbase.org/elf/elf.pdf</a> (page 95)</span>
+<span id="L192" class="LineNr">192 </span>    <span class="Normal">uint32_t</span> p_align = <span class="Constant">0x1000</span><span class="Delimiter">;</span>  <span class="Comment">// default page size on linux</span>
+<span id="L193" class="LineNr">193 </span>    emit<span class="Delimiter">(</span>p_align<span class="Delimiter">);</span>
+<span id="L194" class="LineNr">194 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p_offset % p_align != p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L105'>start</a> % p_align<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L195" class="LineNr">195 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;segment starting at 0x&quot;</span> &lt;&lt; <a href='010vm.cc.html#L239'>HEXWORD</a> &lt;&lt; p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L105'>start</a> &lt;&lt; <span class="Constant">&quot; is improperly aligned; alignment for p_offset &quot;</span> &lt;&lt; p_offset &lt;&lt; <span class="Constant">&quot; should be &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_offset % p_align<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but is &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L105'>start</a> % p_align<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L196" class="LineNr">196 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L197" class="LineNr">197 </span>    <span class="Delimiter">}</span>
+<span id="L198" class="LineNr">198 </span>
+<span id="L199" class="LineNr">199 </span>    <span class="Comment">// prepare for next segment</span>
+<span id="L200" class="LineNr">200 </span>    p_offset += size<span class="Delimiter">;</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Delimiter">}</span>
+<span id="L202" class="LineNr">202 </span><span class="Comment">#undef O</span>
+<span id="L203" class="LineNr">203 </span><span class="Comment">#undef emit</span>
+<span id="L204" class="LineNr">204 </span><span class="Delimiter">}</span>
+<span id="L205" class="LineNr">205 </span>
+<span id="L206" class="LineNr">206 </span><span class="Normal">void</span> <a href='029translate.cc.html#L206'>write_segment</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="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>s<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L208" class="LineNr">208 </span>    <span class="Normal">const</span> vector&lt;word&gt;&amp; w = s<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">;</span>
+<span id="L209" class="LineNr">209 </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="L210" class="LineNr">210 </span>      <span class="Normal">uint8_t</span> x = <a href='011run.cc.html#L222'>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#L117'>data</a><span class="Delimiter">);</span>  <span class="Comment">// we're done with metadata by this point</span>
+<span id="L211" class="LineNr">211 </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="L212" class="LineNr">212 </span>    <span class="Delimiter">}</span>
+<span id="L213" class="LineNr">213 </span>  <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="Normal">uint32_t</span> <a href='029translate.cc.html#L216'>size_of</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L217" class="LineNr">217 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L218" class="LineNr">218 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L219" class="LineNr">219 </span>    sum += <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>
+<span id="L220" class="LineNr">220 </span>  <span class="Identifier">return</span> sum<span class="Delimiter">;</span>
+<span id="L221" class="LineNr">221 </span><span class="Delimiter">}</span>
+<span id="L222" class="LineNr">222 </span>
+<span id="L223" class="LineNr">223 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L224" class="LineNr">224 </span><span class="Normal">using</span> std::ios<span class="Delimiter">;</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/030check_operands.cc.html b/html/subx/030check_operands.cc.html
new file mode 100644
index 00000000..cf8ca1a8
--- /dev/null
+++ b/html/subx/030check_operands.cc.html
@@ -0,0 +1,801 @@
+<!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/030check_operands.cc</title>
+<meta name="Generator" content="Vim/7.4">
+<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; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
+.CommentedCode { color: #6c6c6c; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.PreProc { color: #800080; }
+.traceContains { color: #008000; }
+.cSpecial { 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">//: Beginning of &quot;level 2&quot;: tagging bytes with metadata around what field of</span>
+<span id="L2" class="LineNr">  2 </span><span class="Comment">//: an x86 instruction they're for.</span>
+<span id="L3" class="LineNr">  3 </span><span class="Comment">//:</span>
+<span id="L4" class="LineNr">  4 </span><span class="Comment">//: The x86 instruction set is variable-length, and how a byte is interpreted</span>
+<span id="L5" class="LineNr">  5 </span><span class="Comment">//: affects later instruction boundaries. A lot of the pain in programming machine code</span>
+<span id="L6" class="LineNr">  6 </span><span class="Comment">//: stems from computer and programmer going out of sync on what a byte</span>
+<span id="L7" class="LineNr">  7 </span><span class="Comment">//: means. The miscommunication is usually not immediately caught, and</span>
+<span id="L8" class="LineNr">  8 </span><span class="Comment">//: metastasizes at runtime into kilobytes of misinterpreted instructions.</span>
+<span id="L9" class="LineNr">  9 </span><span class="Comment">//: Tagging bytes with what the programmer expects them to be interpreted as</span>
+<span id="L10" class="LineNr"> 10 </span><span class="Comment">//: helps the computer catch miscommunication immediately.</span>
+<span id="L11" class="LineNr"> 11 </span><span class="Comment">//:</span>
+<span id="L12" class="LineNr"> 12 </span><span class="Comment">//: This is one way SubX is going to be different from a 'language': we</span>
+<span id="L13" class="LineNr"> 13 </span><span class="Comment">//: typically think of languages as less verbose than machine code. Here we're</span>
+<span id="L14" class="LineNr"> 14 </span><span class="Comment">//: making machine code *more* verbose.</span>
+<span id="L15" class="LineNr"> 15 </span><span class="Comment">//:</span>
+<span id="L16" class="LineNr"> 16 </span><span class="Comment">//: ---</span>
+<span id="L17" class="LineNr"> 17 </span><span class="Comment">//:</span>
+<span id="L18" class="LineNr"> 18 </span><span class="Comment">//: While we're here, we'll also improve a couple of other things in level 2:</span>
+<span id="L19" class="LineNr"> 19 </span><span class="Comment">//:</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Comment">//: a) Machine code often packs logically separate operands into bitfields of</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Comment">//: a single byte. In a later layer (pack_operands) we'll start writing out</span>
+<span id="L22" class="LineNr"> 22 </span><span class="Comment">//: each operand separately, and the translator will construct the right bytes</span>
+<span id="L23" class="LineNr"> 23 </span><span class="Comment">//: out of operands.</span>
+<span id="L24" class="LineNr"> 24 </span><span class="Comment">//:</span>
+<span id="L25" class="LineNr"> 25 </span><span class="Comment">//: SubX now gets still more verbose. What used to be a single byte, say 'c3',</span>
+<span id="L26" class="LineNr"> 26 </span><span class="Comment">//: can now expand to '3/mod 0/subop 3/rm32'.</span>
+<span id="L27" class="LineNr"> 27 </span><span class="Comment">//:</span>
+<span id="L28" class="LineNr"> 28 </span><span class="Comment">//: b) Since each operand is tagged, we can loosen ordering restrictions and</span>
+<span id="L29" class="LineNr"> 29 </span><span class="Comment">//: allow writing out the operands in any order, like keyword arguments.</span>
+<span id="L30" class="LineNr"> 30 </span><span class="Comment">//:</span>
+<span id="L31" class="LineNr"> 31 </span><span class="Comment">//: The actual opcodes (first 1-3 bytes of each instruction) will continue to</span>
+<span id="L32" class="LineNr"> 32 </span><span class="Comment">//: be at the start of each line. The x86 instruction set is a mess, and</span>
+<span id="L33" class="LineNr"> 33 </span><span class="Comment">//: opcodes often don't admit good names.</span>
+<span id="L34" class="LineNr"> 34 </span>
+<span id="L35" class="LineNr"> 35 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Texts&quot;)</span>
+<span id="L36" class="LineNr"> 36 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;instructions&quot;</span><span class="Delimiter">,</span>
+<span id="L37" class="LineNr"> 37 </span>  <span class="Constant">&quot;Each x86 instruction consists of an instruction or opcode and some number</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L38" class="LineNr"> 38 </span>  <span class="Constant">&quot;of operands.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L39" class="LineNr"> 39 </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="L40" class="LineNr"> 40 </span>  <span class="Constant">&quot;any type.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L41" class="LineNr"> 41 </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="L42" class="LineNr"> 42 </span>  <span class="Constant">&quot;The complete list of operand <a href='030check_operands.cc.html#L523'>types</a>: mod, subop, r32 (register), rm32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L43" class="LineNr"> 43 </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="L44" class="LineNr"> 44 </span>  <span class="Constant">&quot;imm32.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L45" class="LineNr"> 45 </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>
+<span id="L46" class="LineNr"> 46 </span><span class="Delimiter">);</span>
+<span id="L47" class="LineNr"> 47 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Contents&quot;)</span>
+<span id="L48" class="LineNr"> 48 </span>cerr &lt;&lt; <span class="Constant">&quot;  instructions</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L49" class="LineNr"> 49 </span>
+<span id="L50" class="LineNr"> 50 </span><span class="SalientComment">//:: Check for 'syntax errors'; missing or unexpected operands.</span>
+<span id="L51" class="LineNr"> 51 </span>
+<span id="L52" class="LineNr"> 52 </span><span class="Delimiter">:(scenario check_missing_imm8_operand)</span>
+<span id="L53" class="LineNr"> 53 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L54" class="LineNr"> 54 </span>== <span class="Constant">0x1</span>
+<span id="L55" class="LineNr"> 55 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L56" class="LineNr"> 56 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L57" class="LineNr"> 57 </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="L58" class="LineNr"> 58 </span>  cd                                                                                                                                                <span class="Comment"># int ??</span>
+<span id="L59" class="LineNr"> 59 </span><span class="traceContains">+error: 'cd' (software interrupt): missing imm8 operand</span>
+<span id="L60" class="LineNr"> 60 </span>
+<span id="L61" class="LineNr"> 61 </span><span class="Delimiter">:(before &quot;End Transforms&quot;)</span>
+<span id="L62" class="LineNr"> 62 </span><a href='011run.cc.html#L184'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>check_operands<span class="Delimiter">);</span>
+<span id="L63" class="LineNr"> 63 </span>
+<span id="L64" class="LineNr"> 64 </span><span class="Delimiter">:(code)</span>
+<span id="L65" class="LineNr"> 65 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">const</span><span class="Comment">*/</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L66" class="LineNr"> 66 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check operands&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L67" class="LineNr"> 67 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Normal">const</span> segment&amp; code = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L69" class="LineNr"> 69 </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>code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L70" class="LineNr"> 70 </span>    check_operands<span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L71" class="LineNr"> 71 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L210'>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="L72" class="LineNr"> 72 </span>  <span class="Delimiter">}</span>
+<span id="L73" class="LineNr"> 73 </span><span class="Delimiter">}</span>
+<span id="L74" class="LineNr"> 74 </span>
+<span id="L75" class="LineNr"> 75 </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="L76" class="LineNr"> 76 </span>  <a href='011run.cc.html#L115'>word</a> op = <a href='030check_operands.cc.html#L88'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L78" class="LineNr"> 78 </span>    <a href='030check_operands.cc.html#L609'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L79" class="LineNr"> 79 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Delimiter">}</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L82" class="LineNr"> 82 </span>    <a href='030check_operands.cc.html#L577'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L83" class="LineNr"> 83 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L84" class="LineNr"> 84 </span>  <span class="Delimiter">}</span>
+<span id="L85" class="LineNr"> 85 </span>  check_operands<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L86" class="LineNr"> 86 </span><span class="Delimiter">}</span>
+<span id="L87" class="LineNr"> 87 </span>
+<span id="L88" class="LineNr"> 88 </span><a href='011run.cc.html#L115'>word</a> <a href='030check_operands.cc.html#L88'>preprocess_op</a><span class="Delimiter">(</span><a href='011run.cc.html#L115'>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="L89" class="LineNr"> 89 </span>  op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a> = <a href='030check_operands.cc.html#L643'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
+<span id="L90" class="LineNr"> 90 </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#L117'>data</a><span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span>
+<span id="L91" class="LineNr"> 91 </span>    op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a> = op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="Identifier">return</span> op<span class="Delimiter">;</span>
+<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">}</span>
+<span id="L94" class="LineNr"> 94 </span>
+<span id="L95" class="LineNr"> 95 </span><span class="Comment">//: To check the operands for an opcode, we'll track the permitted operands</span>
+<span id="L96" class="LineNr"> 96 </span><span class="Comment">//: for each supported opcode in a bitvector. That way we can often compute the</span>
+<span id="L97" class="LineNr"> 97 </span><span class="Comment">//: bitvector for each instruction's operands and compare it with the expected.</span>
+<span id="L98" class="LineNr"> 98 </span>
+<span id="L99" class="LineNr"> 99 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L100" class="LineNr">100 </span><span class="Normal">enum</span> <a href='030check_operands.cc.html#L100'>operand_type</a> <span class="Delimiter">{</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Comment">// start from the least significant bit</span>
+<span id="L102" class="LineNr">102 </span>  <a href='030check_operands.cc.html#L102'>MODRM</a><span class="Delimiter">,</span>  <span class="Comment">// more complex, may also involve disp8 or disp32</span>
+<span id="L103" class="LineNr">103 </span>  <a href='030check_operands.cc.html#L103'>SUBOP</a><span class="Delimiter">,</span>
+<span id="L104" class="LineNr">104 </span>  <a href='030check_operands.cc.html#L104'>DISP8</a><span class="Delimiter">,</span>
+<span id="L105" class="LineNr">105 </span>  <a href='030check_operands.cc.html#L105'>DISP16</a><span class="Delimiter">,</span>
+<span id="L106" class="LineNr">106 </span>  <a href='030check_operands.cc.html#L106'>DISP32</a><span class="Delimiter">,</span>
+<span id="L107" class="LineNr">107 </span>  <a href='030check_operands.cc.html#L107'>IMM8</a><span class="Delimiter">,</span>
+<span id="L108" class="LineNr">108 </span>  <a href='030check_operands.cc.html#L108'>IMM32</a><span class="Delimiter">,</span>
+<span id="L109" class="LineNr">109 </span>  <a href='030check_operands.cc.html#L109'>NUM_OPERAND_TYPES</a>
+<span id="L110" class="LineNr">110 </span><span class="Delimiter">};</span>
+<span id="L111" class="LineNr">111 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L112" class="LineNr">112 </span>vector&lt;string&gt; <a href='030check_operands.cc.html#L112'>Operand_type_name</a><span class="Delimiter">;</span>
+<span id="L113" class="LineNr">113 </span>map&lt;string<span class="Delimiter">,</span> operand_type&gt; <a href='030check_operands.cc.html#L113'>Operand_type</a><span class="Delimiter">;</span>
+<span id="L114" class="LineNr">114 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L115" class="LineNr">115 </span><a href='030check_operands.cc.html#L117'>init_op_types</a><span class="Delimiter">();</span>
+<span id="L116" class="LineNr">116 </span><span class="Delimiter">:(code)</span>
+<span id="L117" class="LineNr">117 </span><span class="Normal">void</span> <a href='030check_operands.cc.html#L117'>init_op_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L118" class="LineNr">118 </span>  assert<span class="Delimiter">(</span><a href='030check_operands.cc.html#L109'>NUM_OPERAND_TYPES</a> &lt;= <span class="Comment">/*</span><span class="Comment">bits in a uint8_t</span><span class="Comment">*/</span><span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L119" class="LineNr">119 </span>  <a href='030check_operands.cc.html#L112'>Operand_type_name</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><a href='030check_operands.cc.html#L109'>NUM_OPERAND_TYPES</a><span class="Delimiter">);</span>
+<span id="L120" class="LineNr">120 </span><span class="PreProc">  </span><span class="Comment">#define DEF(type) Operand_type_name.at(type) = tolower(#type), put(Operand_type, tolower(#type), type);</span>
+<span id="L121" class="LineNr">121 </span>  DEF<span class="Delimiter">(</span><a href='030check_operands.cc.html#L102'>MODRM</a><span class="Delimiter">);</span>
+<span id="L122" class="LineNr">122 </span>  DEF<span class="Delimiter">(</span><a href='030check_operands.cc.html#L103'>SUBOP</a><span class="Delimiter">);</span>
+<span id="L123" class="LineNr">123 </span>  DEF<span class="Delimiter">(</span><a href='030check_operands.cc.html#L104'>DISP8</a><span class="Delimiter">);</span>
+<span id="L124" class="LineNr">124 </span>  DEF<span class="Delimiter">(</span><a href='030check_operands.cc.html#L105'>DISP16</a><span class="Delimiter">);</span>
+<span id="L125" class="LineNr">125 </span>  DEF<span class="Delimiter">(</span><a href='030check_operands.cc.html#L106'>DISP32</a><span class="Delimiter">);</span>
+<span id="L126" class="LineNr">126 </span>  DEF<span class="Delimiter">(</span><a href='030check_operands.cc.html#L107'>IMM8</a><span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </span>  DEF<span class="Delimiter">(</span><a href='030check_operands.cc.html#L108'>IMM32</a><span class="Delimiter">);</span>
+<span id="L128" class="LineNr">128 </span><span class="PreProc">  </span><span class="Comment">#undef DEF</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="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L132" class="LineNr">132 </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='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">;</span>
+<span id="L133" class="LineNr">133 </span><span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='030check_operands.cc.html#L133'>INVALID_OPERANDS</a> = <span class="Constant">0xff</span><span class="Delimiter">;</span>  <span class="Comment">// no instruction uses all the operand types</span>
+<span id="L134" class="LineNr">134 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L135" class="LineNr">135 </span><a href='030check_operands.cc.html#L137'>init_permitted_operands</a><span class="Delimiter">();</span>
+<span id="L136" class="LineNr">136 </span><span class="Delimiter">:(code)</span>
+<span id="L137" class="LineNr">137 </span><span class="Normal">void</span> <a href='030check_operands.cc.html#L137'>init_permitted_operands</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L138" class="LineNr">138 </span>  <span class="SalientComment">//// Class A: just op, no operands</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Comment">// halt</span>
+<span id="L140" class="LineNr">140 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;f4&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L141" class="LineNr">141 </span>  <span class="Comment">// push</span>
+<span id="L142" class="LineNr">142 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L143" class="LineNr">143 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L144" class="LineNr">144 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L145" class="LineNr">145 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L147" class="LineNr">147 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L148" class="LineNr">148 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L149" class="LineNr">149 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Comment">// pop</span>
+<span id="L151" class="LineNr">151 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L152" class="LineNr">152 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L153" class="LineNr">153 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L154" class="LineNr">154 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L155" class="LineNr">155 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L156" class="LineNr">156 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L157" class="LineNr">157 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L158" class="LineNr">158 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L159" class="LineNr">159 </span>  <span class="Comment">// return</span>
+<span id="L160" class="LineNr">160 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L161" class="LineNr">161 </span>
+<span id="L162" class="LineNr">162 </span>  <span class="SalientComment">//// Class B: just op and disp8</span>
+<span id="L163" class="LineNr">163 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L164" class="LineNr">164 </span>  <span class="Comment">//  0     0     0      |0       1     0     0</span>
+<span id="L165" class="LineNr">165 </span>
+<span id="L166" class="LineNr">166 </span>  <span class="Comment">// jump</span>
+<span id="L167" class="LineNr">167 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;eb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L168" class="LineNr">168 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;74&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L169" class="LineNr">169 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;75&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L170" class="LineNr">170 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;7c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L171" class="LineNr">171 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;7d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L172" class="LineNr">172 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;7e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L173" class="LineNr">173 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;7f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L174" class="LineNr">174 </span>
+<span id="L175" class="LineNr">175 </span>  <span class="SalientComment">//// Class C: just op and disp16</span>
+<span id="L176" class="LineNr">176 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L177" class="LineNr">177 </span>  <span class="Comment">//  0     0     0      |1       0     0     0</span>
+<span id="L178" class="LineNr">178 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>  <span class="Comment">// jump</span>
+<span id="L179" class="LineNr">179 </span>
+<span id="L180" class="LineNr">180 </span>  <span class="SalientComment">//// Class D: just op and disp32</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L182" class="LineNr">182 </span>  <span class="Comment">//  0     0     1      |0       0     0     0</span>
+<span id="L183" class="LineNr">183 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>  <span class="Comment">// call</span>
+<span id="L184" class="LineNr">184 </span>
+<span id="L185" class="LineNr">185 </span>  <span class="SalientComment">//// Class E: just op and imm8</span>
+<span id="L186" class="LineNr">186 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Comment">//  0     1     0      |0       0     0     0</span>
+<span id="L188" class="LineNr">188 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;cd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x20</span><span class="Delimiter">);</span>  <span class="Comment">// software interrupt</span>
+<span id="L189" class="LineNr">189 </span>
+<span id="L190" class="LineNr">190 </span>  <span class="SalientComment">//// Class F: just op and imm32</span>
+<span id="L191" class="LineNr">191 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L192" class="LineNr">192 </span>  <span class="Comment">//  1     0     0      |0       0     0     0</span>
+<span id="L193" class="LineNr">193 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// add</span>
+<span id="L194" class="LineNr">194 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// subtract</span>
+<span id="L195" class="LineNr">195 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// and</span>
+<span id="L196" class="LineNr">196 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// or</span>
+<span id="L197" class="LineNr">197 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// xor</span>
+<span id="L198" class="LineNr">198 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// compare</span>
+<span id="L199" class="LineNr">199 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// push</span>
+<span id="L200" class="LineNr">200 </span>  <span class="Comment">// copy</span>
+<span id="L201" class="LineNr">201 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L202" class="LineNr">202 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L203" class="LineNr">203 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L204" class="LineNr">204 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L205" class="LineNr">205 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L206" class="LineNr">206 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L207" class="LineNr">207 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L208" class="LineNr">208 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L209" class="LineNr">209 </span>
+<span id="L210" class="LineNr">210 </span>  <span class="SalientComment">//// Class M: using ModR/M byte</span>
+<span id="L211" class="LineNr">211 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L212" class="LineNr">212 </span>  <span class="Comment">//  0     0     0      |0       0     0     1</span>
+<span id="L213" class="LineNr">213 </span>
+<span id="L214" class="LineNr">214 </span>  <span class="Comment">// add</span>
+<span id="L215" class="LineNr">215 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;01&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L216" class="LineNr">216 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;03&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L217" class="LineNr">217 </span>  <span class="Comment">// subtract</span>
+<span id="L218" class="LineNr">218 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;29&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L219" class="LineNr">219 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;2b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L220" class="LineNr">220 </span>  <span class="Comment">// and</span>
+<span id="L221" class="LineNr">221 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L222" class="LineNr">222 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L223" class="LineNr">223 </span>  <span class="Comment">// or</span>
+<span id="L224" class="LineNr">224 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L225" class="LineNr">225 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;0b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L226" class="LineNr">226 </span>  <span class="Comment">// complement</span>
+<span id="L227" class="LineNr">227 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L228" class="LineNr">228 </span>  <span class="Comment">// xor</span>
+<span id="L229" class="LineNr">229 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L230" class="LineNr">230 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;33&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L231" class="LineNr">231 </span>  <span class="Comment">// compare</span>
+<span id="L232" class="LineNr">232 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L233" class="LineNr">233 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L234" class="LineNr">234 </span>  <span class="Comment">// copy</span>
+<span id="L235" class="LineNr">235 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L236" class="LineNr">236 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>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="L237" class="LineNr">237 </span>  <span class="Comment">// swap</span>
+<span id="L238" class="LineNr">238 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>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="L239" class="LineNr">239 </span>  <span class="Comment">// pop</span>
+<span id="L240" class="LineNr">240 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>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="L241" class="LineNr">241 </span>
+<span id="L242" class="LineNr">242 </span>  <span class="SalientComment">//// Class O: op, ModR/M and subop (not r32)</span>
+<span id="L243" class="LineNr">243 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L244" class="LineNr">244 </span>  <span class="Comment">//  0     0     0      |0       0     1     1</span>
+<span id="L245" class="LineNr">245 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>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="L246" class="LineNr">246 </span>
+<span id="L247" class="LineNr">247 </span>  <span class="SalientComment">//// Class N: op, ModR/M and imm32</span>
+<span id="L248" class="LineNr">248 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L249" class="LineNr">249 </span>  <span class="Comment">//  1     0     0      |0       0     0     1</span>
+<span id="L250" class="LineNr">250 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>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="L251" class="LineNr">251 </span>
+<span id="L252" class="LineNr">252 </span>  <span class="SalientComment">//// Class P: op, ModR/M, subop (not r32) and imm32</span>
+<span id="L253" class="LineNr">253 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L254" class="LineNr">254 </span>  <span class="Comment">//  1     0     0      |0       0     1     1</span>
+<span id="L255" class="LineNr">255 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>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="L256" class="LineNr">256 </span>
+<span id="L257" class="LineNr">257 </span>  <span class="Comment">// End Init Permitted Operands</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">:(code)</span>
+<span id="L261" class="LineNr">261 </span><span class="Comment">#define HAS(bitvector, bit)  ((bitvector) &amp; (1 &lt;&lt; (bit)))</span>
+<span id="L262" class="LineNr">262 </span><span class="Comment">#define SET(bitvector, bit)  ((bitvector) | (1 &lt;&lt; (bit)))</span>
+<span id="L263" class="LineNr">263 </span><span class="Comment">#define CLEAR(bitvector, bit)  ((bitvector) &amp; (~(1 &lt;&lt; (bit))))</span>
+<span id="L264" class="LineNr">264 </span>
+<span id="L265" class="LineNr">265 </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="L266" class="LineNr">266 </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="L267" class="LineNr">267 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='030check_operands.cc.html#L132'>Permitted_operands</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">);</span>
+<span id="L268" class="LineNr">268 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='030check_operands.cc.html#L102'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L269" class="LineNr">269 </span>    <a href='030check_operands.cc.html#L401'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L270" class="LineNr">270 </span>    <a href='030check_operands.cc.html#L428'>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="L271" class="LineNr">271 </span>  <span class="Delimiter">}</span>
+<span id="L272" class="LineNr">272 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L273" class="LineNr">273 </span>    <a href='030check_operands.cc.html#L279'>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="L274" class="LineNr">274 </span>  <span class="Delimiter">}</span>
+<span id="L275" class="LineNr">275 </span><span class="Delimiter">}</span>
+<span id="L276" class="LineNr">276 </span>
+<span id="L277" class="LineNr">277 </span><span class="Comment">//: Many instructions can be checked just by comparing bitvectors.</span>
+<span id="L278" class="LineNr">278 </span>
+<span id="L279" class="LineNr">279 </span><span class="Normal">void</span> <a href='030check_operands.cc.html#L279'>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="L280" class="LineNr">280 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030check_operands.cc.html#L337'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='030check_operands.cc.html#L322'>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="L281" class="LineNr">281 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='030check_operands.cc.html#L313'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<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#L210'>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="L283" class="LineNr">283 </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="L284" class="LineNr">284 </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='030check_operands.cc.html#L109'>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="L285" class="LineNr">285 </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="L286" class="LineNr">286 </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="L287" class="LineNr">287 </span>    <span class="Normal">const</span> string&amp; optype = <a href='030check_operands.cc.html#L112'>Operand_type_name</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>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="L289" class="LineNr">289 </span>      <a href='003trace.cc.html#L197'>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='030check_operands.cc.html#L297'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L290" class="LineNr">290 </span>    <span class="Normal">else</span>
+<span id="L291" class="LineNr">291 </span>      <a href='003trace.cc.html#L197'>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='030check_operands.cc.html#L297'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L292" class="LineNr">292 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L293" class="LineNr">293 </span>  <span class="Delimiter">}</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Comment">// ignore settings in any unused bits</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>string <a href='030check_operands.cc.html#L297'>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="L298" class="LineNr">298 </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="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+get<span class="Delimiter">(</span><a href='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">)</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
+<span id="L301" class="LineNr">301 </span><span class="Delimiter">}</span>
+<span id="L302" class="LineNr">302 </span>
+<span id="L303" class="LineNr">303 </span><span class="Normal">bool</span> <a href='030check_operands.cc.html#L303'>is_hex_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030check_operands.cc.html#L344'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
+<span id="L305" class="LineNr">305 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L306" class="LineNr">306 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span>
+<span id="L307" class="LineNr">307 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L308" class="LineNr">308 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">.</span>find_first_not_of<span class="Delimiter">(</span><span class="Constant">&quot;0123456789abcdefABCDEF&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span>
+<span id="L309" class="LineNr">309 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L310" class="LineNr">310 </span>  <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L311" class="LineNr">311 </span><span class="Delimiter">}</span>
+<span id="L312" class="LineNr">312 </span>
+<span id="L313" class="LineNr">313 </span><span class="Normal">uint32_t</span> <a href='030check_operands.cc.html#L313'>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="L314" class="LineNr">314 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="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#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L316" class="LineNr">316 </span>    bitvector = bitvector | <a href='030check_operands.cc.html#L353'>bitvector_for_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L317" class="LineNr">317 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L210'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='030check_operands.cc.html#L133'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L318" class="LineNr">318 </span>  <span class="Delimiter">}</span>
+<span id="L319" class="LineNr">319 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
+<span id="L320" class="LineNr">320 </span><span class="Delimiter">}</span>
+<span id="L321" class="LineNr">321 </span>
+<span id="L322" class="LineNr">322 </span><span class="Normal">bool</span> <a href='030check_operands.cc.html#L322'>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="L323" class="LineNr">323 </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#L111'>words</a><span class="Delimiter">)</span> &gt; <a href='030check_operands.cc.html#L326'>first_operand</a><span class="Delimiter">(</span>inst<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> <a href='030check_operands.cc.html#L326'>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="L327" class="LineNr">327 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>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#L117'>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="L328" class="LineNr">328 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>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#L117'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L329" class="LineNr">329 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>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#L117'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
+<span id="L330" class="LineNr">330 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
+<span id="L331" class="LineNr">331 </span>    <span class="Normal">else</span>
+<span id="L332" class="LineNr">332 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L333" class="LineNr">333 </span>  <span class="Delimiter">}</span>
+<span id="L334" class="LineNr">334 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L335" class="LineNr">335 </span><span class="Delimiter">}</span>
+<span id="L336" class="LineNr">336 </span>
+<span id="L337" class="LineNr">337 </span><span class="Normal">bool</span> <a href='030check_operands.cc.html#L337'>all_hex_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L338" class="LineNr">338 </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#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L339" class="LineNr">339 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
+<span id="L340" class="LineNr">340 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L341" class="LineNr">341 </span>  <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L342" class="LineNr">342 </span><span class="Delimiter">}</span>
+<span id="L343" class="LineNr">343 </span>
+<span id="L344" class="LineNr">344 </span><span class="Normal">bool</span> <a href='030check_operands.cc.html#L344'>contains_any_operand_metadata</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; <a href='011run.cc.html#L115'>word</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L345" class="LineNr">345 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='011run.cc.html#L115'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L346" class="LineNr">346 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030check_operands.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='011run.cc.html#L115'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> != <a href='030check_operands.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">())</span>
+<span id="L347" class="LineNr">347 </span>      <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L348" class="LineNr">348 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L349" class="LineNr">349 </span><span class="Delimiter">}</span>
+<span id="L350" class="LineNr">350 </span>
+<span id="L351" class="LineNr">351 </span><span class="Comment">// Scan the metadata of 'w' and return the bit corresponding to any operand type.</span>
+<span id="L352" class="LineNr">352 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
+<span id="L353" class="LineNr">353 </span><span class="Normal">uint32_t</span> <a href='030check_operands.cc.html#L353'>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="L354" class="LineNr">354 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L355" class="LineNr">355 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L356" class="LineNr">356 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='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="L357" class="LineNr">357 </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="L358" class="LineNr">358 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='030check_operands.cc.html#L113'>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="L359" class="LineNr">359 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L360" class="LineNr">360 </span>      <a href='003trace.cc.html#L197'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L361" class="LineNr">361 </span>      <span class="Identifier">return</span> <a href='030check_operands.cc.html#L133'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
+<span id="L362" class="LineNr">362 </span>    <span class="Delimiter">}</span>
+<span id="L363" class="LineNr">363 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><a href='030check_operands.cc.html#L113'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">));</span>
+<span id="L364" class="LineNr">364 </span>    found =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L365" class="LineNr">365 </span>  <span class="Delimiter">}</span>
+<span id="L366" class="LineNr">366 </span>  <span class="Identifier">return</span> bv<span class="Delimiter">;</span>
+<span id="L367" class="LineNr">367 </span><span class="Delimiter">}</span>
+<span id="L368" class="LineNr">368 </span>
+<span id="L369" class="LineNr">369 </span><span class="Delimiter">:(scenario conflicting_operand_type)</span>
+<span id="L370" class="LineNr">370 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L371" class="LineNr">371 </span>== <span class="Constant">0x1</span>
+<span id="L372" class="LineNr">372 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
+<span id="L373" class="LineNr">373 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
+<span id="L374" class="LineNr">374 </span>
+<span id="L375" class="LineNr">375 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
+<span id="L376" class="LineNr">376 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
+<span id="L377" class="LineNr">377 </span>
+<span id="L378" class="LineNr">378 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
+<span id="L379" class="LineNr">379 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L380" class="LineNr">380 </span>== <span class="Constant">0x1</span>
+<span id="L381" class="LineNr">381 </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="L382" class="LineNr">382 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with <a href='011run.cc.html#L253'>imm32</a> based on subop): missing mod operand</span>
+<span id="L383" class="LineNr">383 </span>
+<span id="L384" class="LineNr">384 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L385" class="LineNr">385 </span>set&lt;string&gt; <a href='030check_operands.cc.html#L385'>Instruction_operands</a><span class="Delimiter">;</span>
+<span id="L386" class="LineNr">386 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L387" class="LineNr">387 </span><a href='030check_operands.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;subop&quot;</span><span class="Delimiter">);</span>
+<span id="L388" class="LineNr">388 </span><a href='030check_operands.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;mod&quot;</span><span class="Delimiter">);</span>
+<span id="L389" class="LineNr">389 </span><a href='030check_operands.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L390" class="LineNr">390 </span><a href='030check_operands.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;base&quot;</span><span class="Delimiter">);</span>
+<span id="L391" class="LineNr">391 </span><a href='030check_operands.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;index&quot;</span><span class="Delimiter">);</span>
+<span id="L392" class="LineNr">392 </span><a href='030check_operands.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;scale&quot;</span><span class="Delimiter">);</span>
+<span id="L393" class="LineNr">393 </span><a href='030check_operands.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;r32&quot;</span><span class="Delimiter">);</span>
+<span id="L394" class="LineNr">394 </span><a href='030check_operands.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">);</span>
+<span id="L395" class="LineNr">395 </span><a href='030check_operands.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">);</span>
+<span id="L396" class="LineNr">396 </span><a href='030check_operands.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">);</span>
+<span id="L397" class="LineNr">397 </span><a href='030check_operands.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">);</span>
+<span id="L398" class="LineNr">398 </span><a href='030check_operands.cc.html#L385'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">);</span>
+<span id="L399" class="LineNr">399 </span>
+<span id="L400" class="LineNr">400 </span><span class="Delimiter">:(code)</span>
+<span id="L401" class="LineNr">401 </span><span class="Normal">void</span> <a href='030check_operands.cc.html#L401'>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="L402" class="LineNr">402 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030check_operands.cc.html#L337'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
+<span id="L403" class="LineNr">403 </span>  <a href='030check_operands.cc.html#L448'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L404" class="LineNr">404 </span>  <a href='030check_operands.cc.html#L448'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L405" class="LineNr">405 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
+<span id="L406" class="LineNr">406 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a> == <span class="Constant">&quot;81&quot;</span> || op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a> == <span class="Constant">&quot;8f&quot;</span> || op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>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="L407" class="LineNr">407 </span>    <a href='030check_operands.cc.html#L448'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L408" class="LineNr">408 </span>    <a href='030check_operands.cc.html#L453'>check_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;should be replaced by subop&quot;</span><span class="Delimiter">);</span>
+<span id="L409" class="LineNr">409 </span>  <span class="Delimiter">}</span>
+<span id="L410" class="LineNr">410 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L210'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L411" class="LineNr">411 </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#L117'>data</a> != <span class="Constant">&quot;4&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L412" class="LineNr">412 </span>  <span class="Comment">// SIB byte checks</span>
+<span id="L413" class="LineNr">413 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L222'>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#L117'>data</a><span class="Delimiter">);</span>
+<span id="L414" class="LineNr">414 </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="L415" class="LineNr">415 </span>    <a href='030check_operands.cc.html#L448'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L416" class="LineNr">416 </span>    <a href='030check_operands.cc.html#L448'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>  <span class="Comment">// otherwise why go to SIB?</span>
+<span id="L417" class="LineNr">417 </span>  <span class="Delimiter">}</span>
+<span id="L418" class="LineNr">418 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L419" class="LineNr">419 </span>    <a href='030check_operands.cc.html#L453'>check_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
+<span id="L420" class="LineNr">420 </span>    <a href='030check_operands.cc.html#L453'>check_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
+<span id="L421" class="LineNr">421 </span>  <span class="Delimiter">}</span>
+<span id="L422" class="LineNr">422 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span>
+<span id="L423" class="LineNr">423 </span><span class="Delimiter">}</span>
+<span id="L424" class="LineNr">424 </span>
+<span id="L425" class="LineNr">425 </span><span class="Comment">// same as compare_bitvector, with a couple of exceptions for modrm-based instructions</span>
+<span id="L426" class="LineNr">426 </span><span class="Comment">//   exception 1: ignore modrm bit since we already checked it above</span>
+<span id="L427" class="LineNr">427 </span><span class="Comment">//   exception 2: modrm instructions can use a displacement on occasion</span>
+<span id="L428" class="LineNr">428 </span><span class="Normal">void</span> <a href='030check_operands.cc.html#L428'>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="L429" class="LineNr">429 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030check_operands.cc.html#L337'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='030check_operands.cc.html#L322'>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="L430" class="LineNr">430 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='030check_operands.cc.html#L313'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L431" class="LineNr">431 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L210'>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="L432" class="LineNr">432 </span>  expected = CLEAR<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <a href='030check_operands.cc.html#L102'>MODRM</a><span class="Delimiter">);</span>  <span class="Comment">// exception 1</span>
+<span id="L433" class="LineNr">433 </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="L434" class="LineNr">434 </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='030check_operands.cc.html#L109'>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="L435" class="LineNr">435 </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="L436" class="LineNr">436 </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="L437" class="LineNr">437 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='030check_operands.cc.html#L104'>DISP8</a> || i == <a href='030check_operands.cc.html#L106'>DISP32</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
+<span id="L438" class="LineNr">438 </span>    <span class="Normal">const</span> string&amp; optype = <a href='030check_operands.cc.html#L112'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L439" class="LineNr">439 </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="L440" class="LineNr">440 </span>      <a href='003trace.cc.html#L197'>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='030check_operands.cc.html#L297'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L441" class="LineNr">441 </span>    <span class="Normal">else</span>
+<span id="L442" class="LineNr">442 </span>      <a href='003trace.cc.html#L197'>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='030check_operands.cc.html#L297'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L443" class="LineNr">443 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L444" class="LineNr">444 </span>  <span class="Delimiter">}</span>
+<span id="L445" class="LineNr">445 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L446" class="LineNr">446 </span><span class="Delimiter">}</span>
+<span id="L447" class="LineNr">447 </span>
+<span id="L448" class="LineNr">448 </span><span class="Normal">void</span> <a href='030check_operands.cc.html#L448'>check_metadata_present</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L449" class="LineNr">449 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
+<span id="L450" class="LineNr">450 </span>    <a href='003trace.cc.html#L197'>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='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L451" class="LineNr">451 </span><span class="Delimiter">}</span>
+<span id="L452" class="LineNr">452 </span>
+<span id="L453" class="LineNr">453 </span><span class="Normal">void</span> <a href='030check_operands.cc.html#L453'>check_metadata_absent</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; msg<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L454" class="LineNr">454 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
+<span id="L455" class="LineNr">455 </span>    <a href='003trace.cc.html#L197'>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='010vm.cc.html#L207'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L456" class="LineNr">456 </span><span class="Delimiter">}</span>
+<span id="L457" class="LineNr">457 </span>
+<span id="L458" class="LineNr">458 </span><span class="Normal">bool</span> has_metadata<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L459" class="LineNr">459 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L460" class="LineNr">460 </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#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L461" class="LineNr">461 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L462" class="LineNr">462 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L463" class="LineNr">463 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' has conflicting &quot;</span> &lt;&lt; m &lt;&lt; <span class="Constant">&quot; operands</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L464" class="LineNr">464 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L465" class="LineNr">465 </span>    <span class="Delimiter">}</span>
+<span id="L466" class="LineNr">466 </span>    result =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L467" class="LineNr">467 </span>  <span class="Delimiter">}</span>
+<span id="L468" class="LineNr">468 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L469" class="LineNr">469 </span><span class="Delimiter">}</span>
+<span id="L470" class="LineNr">470 </span>
+<span id="L471" class="LineNr">471 </span><span class="Normal">bool</span> has_metadata<span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L472" class="LineNr">472 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L473" class="LineNr">473 </span>  <span class="Normal">bool</span> metadata_found =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L474" class="LineNr">474 </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="L475" class="LineNr">475 </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="L476" class="LineNr">476 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='030check_operands.cc.html#L385'>Instruction_operands</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="L477" class="LineNr">477 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>metadata_found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L478" class="LineNr">478 </span>      <a href='003trace.cc.html#L197'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L479" class="LineNr">479 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L480" class="LineNr">480 </span>    <span class="Delimiter">}</span>
+<span id="L481" class="LineNr">481 </span>    metadata_found =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L482" class="LineNr">482 </span>    result = <span class="Delimiter">(</span>curr == m<span class="Delimiter">);</span>
+<span id="L483" class="LineNr">483 </span>  <span class="Delimiter">}</span>
+<span id="L484" class="LineNr">484 </span>  <span class="Identifier">return</span> result<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><a href='011run.cc.html#L115'>word</a> metadata<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L488" class="LineNr">488 </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#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L489" class="LineNr">489 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span>
+<span id="L490" class="LineNr">490 </span>      <span class="Identifier">return</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L491" class="LineNr">491 </span>  assert<span class="Delimiter">(</span><span class="Constant">false</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="Delimiter">:(scenarios transform)</span>
+<span id="L495" class="LineNr">495 </span><span class="Delimiter">:(scenario modrm_with_displacement)</span>
+<span id="L496" class="LineNr">496 </span><span class="Special">% Reg[EAX].u = 0x1;</span>
+<span id="L497" class="LineNr">497 </span>== <span class="Constant">0x1</span>
+<span id="L498" class="LineNr">498 </span><span class="Comment"># just avoid null pointer</span>
+<span id="L499" class="LineNr">499 </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="L500" class="LineNr">500 </span>$error: <span class="Constant">0</span>
+<span id="L501" class="LineNr">501 </span><span class="Delimiter">:(scenarios run)</span>
+<span id="L502" class="LineNr">502 </span>
+<span id="L503" class="LineNr">503 </span><span class="Comment">//: helper for scenario</span>
+<span id="L504" class="LineNr">504 </span><span class="Delimiter">:(code)</span>
+<span id="L505" class="LineNr">505 </span><span class="Normal">void</span> transform<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L506" class="LineNr">506 </span>  <a href='011run.cc.html#L96'>program</a> p<span class="Delimiter">;</span>
+<span id="L507" class="LineNr">507 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
+<span id="L508" class="LineNr">508 </span>  <a href='011run.cc.html#L124'>parse</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
+<span id="L509" class="LineNr">509 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L210'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L510" class="LineNr">510 </span>  transform<span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L511" class="LineNr">511 </span><span class="Delimiter">}</span>
+<span id="L512" class="LineNr">512 </span>
+<span id="L513" class="LineNr">513 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
+<span id="L514" class="LineNr">514 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L515" class="LineNr">515 </span>== <span class="Constant">0x1</span>
+<span id="L516" class="LineNr">516 </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="L517" class="LineNr">517 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
+<span id="L518" class="LineNr">518 </span>
+<span id="L519" class="LineNr">519 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
+<span id="L520" class="LineNr">520 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L521" class="LineNr">521 </span>== <span class="Constant">0x1</span>
+<span id="L522" class="LineNr">522 </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="L523" class="LineNr">523 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
+<span id="L524" class="LineNr">524 </span>
+<span id="L525" class="LineNr">525 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
+<span id="L526" class="LineNr">526 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L527" class="LineNr">527 </span>== <span class="Constant">0x1</span>
+<span id="L528" class="LineNr">528 </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="L529" class="LineNr">529 </span><span class="traceContains">+error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with <a href='011run.cc.html#L253'>imm32</a> based on subop): missing rm32 operand</span>
+<span id="L530" class="LineNr">530 </span>
+<span id="L531" class="LineNr">531 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
+<span id="L532" class="LineNr">532 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L533" class="LineNr">533 </span>== <span class="Constant">0x1</span>
+<span id="L534" class="LineNr">534 </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="L535" class="LineNr">535 </span><span class="traceContains">+error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with <a href='011run.cc.html#L253'>imm32</a> based on subop): missing subop operand</span>
+<span id="L536" class="LineNr">536 </span>
+<span id="L537" class="LineNr">537 </span><span class="Delimiter">:(scenario check_missing_base_operand)</span>
+<span id="L538" class="LineNr">538 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L539" class="LineNr">539 </span>== <span class="Constant">0x1</span>
+<span id="L540" class="LineNr">540 </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="L541" class="LineNr">541 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with <a href='011run.cc.html#L253'>imm32</a> based on subop): missing base operand</span>
+<span id="L542" class="LineNr">542 </span>
+<span id="L543" class="LineNr">543 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
+<span id="L544" class="LineNr">544 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L545" class="LineNr">545 </span>== <span class="Constant">0x1</span>
+<span id="L546" class="LineNr">546 </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="L547" class="LineNr">547 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32' (combine rm32 with <a href='011run.cc.html#L253'>imm32</a> based on subop): missing index operand</span>
+<span id="L548" class="LineNr">548 </span>
+<span id="L549" class="LineNr">549 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</span>
+<span id="L550" class="LineNr">550 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L551" class="LineNr">551 </span>== <span class="Constant">0x1</span>
+<span id="L552" class="LineNr">552 </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="L553" class="LineNr">553 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32' (combine rm32 with <a href='011run.cc.html#L253'>imm32</a> based on subop): missing base operand</span>
+<span id="L554" class="LineNr">554 </span>
+<span id="L555" class="LineNr">555 </span><span class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
+<span id="L556" class="LineNr">556 </span>== <span class="Constant">0x1</span>
+<span id="L557" class="LineNr">557 </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="L558" class="LineNr">558 </span>$error: <span class="Constant">0</span>
+<span id="L559" class="LineNr">559 </span>
+<span id="L560" class="LineNr">560 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
+<span id="L561" class="LineNr">561 </span>
+<span id="L562" class="LineNr">562 </span><span class="Delimiter">:(code)</span>
+<span id="L563" class="LineNr">563 </span><span class="Normal">void</span> <a href='030check_operands.cc.html#L609'>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="L564" class="LineNr">564 </span>  assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>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#L117'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
+<span id="L565" class="LineNr">565 </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#L111'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L566" class="LineNr">566 </span>    <a href='003trace.cc.html#L197'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L567" class="LineNr">567 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L568" class="LineNr">568 </span>  <span class="Delimiter">}</span>
+<span id="L569" class="LineNr">569 </span>  <a href='011run.cc.html#L115'>word</a> op = <a href='030check_operands.cc.html#L88'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
+<span id="L570" class="LineNr">570 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010vm.cc.html#L208'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L571" class="LineNr">571 </span>    <a href='003trace.cc.html#L197'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L572" class="LineNr">572 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L573" class="LineNr">573 </span>  <span class="Delimiter">}</span>
+<span id="L574" class="LineNr">574 </span>  <a href='030check_operands.cc.html#L609'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L575" class="LineNr">575 </span><span class="Delimiter">}</span>
+<span id="L576" class="LineNr">576 </span>
+<span id="L577" class="LineNr">577 </span><span class="Normal">void</span> <a href='030check_operands.cc.html#L577'>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="L578" class="LineNr">578 </span>  <a href='003trace.cc.html#L197'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L579" class="LineNr">579 </span><span class="Delimiter">}</span>
+<span id="L580" class="LineNr">580 </span>
+<span id="L581" class="LineNr">581 </span><span class="Delimiter">:(scenario check_missing_disp16_operand)</span>
+<span id="L582" class="LineNr">582 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L583" class="LineNr">583 </span>== <span class="Constant">0x1</span>
+<span id="L584" class="LineNr">584 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L585" class="LineNr">585 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L586" class="LineNr">586 </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="L587" class="LineNr">587 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                             <span class="Comment"># jmp if ZF to ??</span>
+<span id="L588" class="LineNr">588 </span><span class="traceContains">+error: '0f 84' (jump disp16 bytes away if ZF is set): missing disp16 operand</span>
+<span id="L589" class="LineNr">589 </span>
+<span id="L590" class="LineNr">590 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L591" class="LineNr">591 </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='030check_operands.cc.html#L591'>Permitted_operands_0f</a><span class="Delimiter">;</span>
+<span id="L592" class="LineNr">592 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
+<span id="L593" class="LineNr">593 </span><span class="SalientComment">//// Class C: just op and disp16</span>
+<span id="L594" class="LineNr">594 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L595" class="LineNr">595 </span><span class="Comment">//  0     0     0      |1       0     0     0</span>
+<span id="L596" class="LineNr">596 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L591'>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="L597" class="LineNr">597 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L591'>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="L598" class="LineNr">598 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L591'>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="L599" class="LineNr">599 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L591'>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="L600" class="LineNr">600 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L591'>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="L601" class="LineNr">601 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L591'>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="L602" class="LineNr">602 </span>
+<span id="L603" class="LineNr">603 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
+<span id="L604" class="LineNr">604 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L605" class="LineNr">605 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
+<span id="L606" class="LineNr">606 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='030check_operands.cc.html#L591'>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="L607" class="LineNr">607 </span>
+<span id="L608" class="LineNr">608 </span><span class="Delimiter">:(code)</span>
+<span id="L609" class="LineNr">609 </span><span class="Normal">void</span> <a href='030check_operands.cc.html#L609'>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="L610" class="LineNr">610 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='030check_operands.cc.html#L591'>Permitted_operands_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">);</span>
+<span id="L611" class="LineNr">611 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='030check_operands.cc.html#L102'>MODRM</a><span class="Delimiter">))</span>
+<span id="L612" class="LineNr">612 </span>    <a href='030check_operands.cc.html#L401'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L613" class="LineNr">613 </span>  <a href='030check_operands.cc.html#L616'>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='030check_operands.cc.html#L102'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
+<span id="L614" class="LineNr">614 </span><span class="Delimiter">}</span>
+<span id="L615" class="LineNr">615 </span>
+<span id="L616" class="LineNr">616 </span><span class="Normal">void</span> <a href='030check_operands.cc.html#L616'>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="L617" class="LineNr">617 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030check_operands.cc.html#L337'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='030check_operands.cc.html#L322'>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="L618" class="LineNr">618 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='030check_operands.cc.html#L313'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L619" class="LineNr">619 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L210'>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="L620" class="LineNr">620 </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="L621" class="LineNr">621 </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='030check_operands.cc.html#L109'>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="L622" class="LineNr">622 </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="L623" class="LineNr">623 </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="L624" class="LineNr">624 </span>    <span class="Normal">const</span> string&amp; optype = <a href='030check_operands.cc.html#L112'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L625" class="LineNr">625 </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="L626" class="LineNr">626 </span>      <a href='003trace.cc.html#L197'>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='010vm.cc.html#L208'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L627" class="LineNr">627 </span>    <span class="Normal">else</span>
+<span id="L628" class="LineNr">628 </span>      <a href='003trace.cc.html#L197'>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='010vm.cc.html#L208'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L117'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L629" class="LineNr">629 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L630" class="LineNr">630 </span>  <span class="Delimiter">}</span>
+<span id="L631" class="LineNr">631 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L632" class="LineNr">632 </span><span class="Delimiter">}</span>
+<span id="L633" class="LineNr">633 </span>
+<span id="L634" class="LineNr">634 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L635" class="LineNr">635 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L636" class="LineNr">636 </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#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L637" class="LineNr">637 </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="L638" class="LineNr">638 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L116'>original</a><span class="Delimiter">;</span>
+<span id="L639" class="LineNr">639 </span>  <span class="Delimiter">}</span>
+<span id="L640" class="LineNr">640 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L641" class="LineNr">641 </span><span class="Delimiter">}</span>
+<span id="L642" class="LineNr">642 </span>
+<span id="L643" class="LineNr">643 </span>string <a href='030check_operands.cc.html#L643'>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="L644" class="LineNr">644 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L645" class="LineNr">645 </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="L646" class="LineNr">646 </span>    out &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">char</span>&gt;<span class="Delimiter">(</span><a href='030check_operands.cc.html#L643'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
+<span id="L647" class="LineNr">647 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L648" class="LineNr">648 </span><span class="Delimiter">}</span>
+<span id="L649" class="LineNr">649 </span>
+<span id="L650" class="LineNr">650 </span><span class="Comment">#undef HAS</span>
+<span id="L651" class="LineNr">651 </span><span class="Comment">#undef SET</span>
+<span id="L652" class="LineNr">652 </span><span class="Comment">#undef CLEAR</span>
+<span id="L653" class="LineNr">653 </span>
+<span id="L654" class="LineNr">654 </span><span class="SalientComment">//:: docs on each operand type</span>
+<span id="L655" class="LineNr">655 </span>
+<span id="L656" class="LineNr">656 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Texts&quot;)</span>
+<span id="L657" class="LineNr">657 </span><a href='030check_operands.cc.html#L659'>init_operand_type_help</a><span class="Delimiter">();</span>
+<span id="L658" class="LineNr">658 </span><span class="Delimiter">:(code)</span>
+<span id="L659" class="LineNr">659 </span><span class="Normal">void</span> <a href='030check_operands.cc.html#L659'>init_operand_type_help</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L660" class="LineNr">660 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span>
+<span id="L661" class="LineNr">661 </span>    <span class="Constant">&quot;2-bit operand controlling the _addressing mode_ of many instructions,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L662" class="LineNr">662 </span>    <span class="Constant">&quot;to determine how to compute the _effective address_ to look up memory at</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L663" class="LineNr">663 </span>    <span class="Constant">&quot;based on the 'rm32' operand and potentially others.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L664" class="LineNr">664 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L665" class="LineNr">665 </span>    <span class="Constant">&quot;If mod = 3, just operate on the <a href='003trace.cc.html#L74'>contents</a> of the register specified by rm32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L666" class="LineNr">666 </span>    <span class="Constant">&quot;            (direct mode).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L667" class="LineNr">667 </span>    <span class="Constant">&quot;If mod = 2, effective address is usually* rm32 + disp32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L668" class="LineNr">668 </span>    <span class="Constant">&quot;            (indirect mode with displacement).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L669" class="LineNr">669 </span>    <span class="Constant">&quot;If mod = 1, effective address is usually* rm32 + disp8</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L670" class="LineNr">670 </span>    <span class="Constant">&quot;            (indirect mode with displacement).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L671" class="LineNr">671 </span>    <span class="Constant">&quot;If mod = 0, effective address is usually* rm32 (indirect mode).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L672" class="LineNr">672 </span>    <span class="Constant">&quot;(* - The exception is when rm32 is '4'. Register 4 is the stack pointer (ESP).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L673" class="LineNr">673 </span>    <span class="Constant">&quot;     Using it as an address gets more involved. For more details,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L674" class="LineNr">674 </span>    <span class="Constant">&quot;     try reading the help pages for 'base', 'index' and 'scale'.)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L675" class="LineNr">675 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L676" class="LineNr">676 </span>    <span class="Constant">&quot;For complete details consult the IA-32 software developer's manual, table 2-2,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L677" class="LineNr">677 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing forms with the ModR/M byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L678" class="LineNr">678 </span>    <span class="Constant">&quot;  <a href="https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf">https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L679" class="LineNr">679 </span>  <span class="Delimiter">);</span>
+<span id="L680" class="LineNr">680 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span>
+<span id="L681" class="LineNr">681 </span>    <span class="Constant">&quot;Additional 3-bit operand for determining the instruction when the opcode is 81, 8f or ff.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L682" class="LineNr">682 </span>    <span class="Constant">&quot;Can't coexist with operand of type 'r32' in a single instruction, because the two use the same bits.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L683" class="LineNr">683 </span>  <span class="Delimiter">);</span>
+<span id="L684" class="LineNr">684 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span>
+<span id="L685" class="LineNr">685 </span>    <span class="Constant">&quot;3-bit operand specifying a register operand used directly, without any further addressing modes.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L686" class="LineNr">686 </span>  <span class="Delimiter">);</span>
+<span id="L687" class="LineNr">687 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span>
+<span id="L688" class="LineNr">688 </span>    <span class="Constant">&quot;3-bit operand specifying a register operand whose precise interpretation interacts with 'mod'.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L689" class="LineNr">689 </span>    <span class="Constant">&quot;For complete details consult the IA-32 software developer's manual, table 2-2,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L690" class="LineNr">690 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing forms with the ModR/M byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L691" class="LineNr">691 </span>    <span class="Constant">&quot;  <a href="https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf">https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L692" class="LineNr">692 </span>  <span class="Delimiter">);</span>
+<span id="L693" class="LineNr">693 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span>
+<span id="L694" class="LineNr">694 </span>    <span class="Constant">&quot;Additional 3-bit operand (when 'rm32' is 4 unless 'mod' is 3) specifying the register containing an address to look up.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L695" class="LineNr">695 </span>    <span class="Constant">&quot;This address may be further modified by 'index' and 'scale' operands.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L696" class="LineNr">696 </span>    <span class="Constant">&quot;  effective address = base + index*scale + displacement (disp8 or disp32)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L697" class="LineNr">697 </span>    <span class="Constant">&quot;For complete details consult the IA-32 software developer's manual, table 2-3,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L698" class="LineNr">698 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing forms with the SIB byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L699" class="LineNr">699 </span>    <span class="Constant">&quot;  <a href="https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf">https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L700" class="LineNr">700 </span>  <span class="Delimiter">);</span>
+<span id="L701" class="LineNr">701 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span>
+<span id="L702" class="LineNr">702 </span>    <span class="Constant">&quot;Optional 3-bit operand (when 'rm32' is 4 unless 'mod' is 3) that can be added to the 'base' operand to compute the 'effective address' at which to look up memory.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L703" class="LineNr">703 </span>    <span class="Constant">&quot;  effective address = base + index*scale + displacement (disp8 or disp32)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L704" class="LineNr">704 </span>    <span class="Constant">&quot;For complete details consult the IA-32 software developer's manual, table 2-3,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L705" class="LineNr">705 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing forms with the SIB byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L706" class="LineNr">706 </span>    <span class="Constant">&quot;  <a href="https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf">https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L707" class="LineNr">707 </span>  <span class="Delimiter">);</span>
+<span id="L708" class="LineNr">708 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;scale&quot;</span><span class="Delimiter">,</span>
+<span id="L709" class="LineNr">709 </span>    <span class="Constant">&quot;Optional 2-bit operand (when 'rm32' is 4 unless 'mod' is 3) that can be multiplied to the 'index' operand before adding the result to the 'base' operand to compute the _effective address_ to operate on.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L710" class="LineNr">710 </span>    <span class="Constant">&quot;  effective address = base + index * scale + displacement (disp8 or disp32)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L711" class="LineNr">711 </span>    <span class="Constant">&quot;For complete details consult the IA-32 software developer's manual, table 2-3,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L712" class="LineNr">712 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing forms with the SIB byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L713" class="LineNr">713 </span>    <span class="Constant">&quot;  <a href="https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf">https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L714" class="LineNr">714 </span>  <span class="Delimiter">);</span>
+<span id="L715" class="LineNr">715 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">,</span>
+<span id="L716" class="LineNr">716 </span>    <span class="Constant">&quot;8-bit value to be added in many instructions.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L717" class="LineNr">717 </span>  <span class="Delimiter">);</span>
+<span id="L718" class="LineNr">718 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">,</span>
+<span id="L719" class="LineNr">719 </span>    <span class="Constant">&quot;16-bit value to be added in many instructions.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L720" class="LineNr">720 </span>  <span class="Delimiter">);</span>
+<span id="L721" class="LineNr">721 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">,</span>
+<span id="L722" class="LineNr">722 </span>    <span class="Constant">&quot;32-bit value to be added in many instructions.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L723" class="LineNr">723 </span>  <span class="Delimiter">);</span>
+<span id="L724" class="LineNr">724 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">,</span>
+<span id="L725" class="LineNr">725 </span>    <span class="Constant">&quot;8-bit value for many instructions.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L726" class="LineNr">726 </span>  <span class="Delimiter">);</span>
+<span id="L727" class="LineNr">727 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">,</span>
+<span id="L728" class="LineNr">728 </span>    <span class="Constant">&quot;32-bit value for many instructions.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L729" class="LineNr">729 </span>  <span class="Delimiter">);</span>
+<span id="L730" class="LineNr">730 </span><span class="Delimiter">}</span>
+<span id="L731" class="LineNr">731 </span>
+<span id="L732" class="LineNr">732 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L733" class="LineNr">733 </span><span class="Comment">#include&lt;cctype&gt;</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/023check_operand_bounds.cc.html b/html/subx/031check_operand_bounds.cc.html
index f86b5dd4..b484db41 100644
--- a/html/subx/023check_operand_bounds.cc.html
+++ b/html/subx/031check_operand_bounds.cc.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/023check_operand_bounds.cc</title>
+<title>Mu - subx/031check_operand_bounds.cc</title>
 <meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
@@ -70,54 +70,54 @@ if ('onhashchange' in window) {
 <span id="L7" class="LineNr"> 7 </span><span class="traceContains">+error: '4/mod' too large to fit in bitfield mod</span>
 <span id="L8" class="LineNr"> 8 </span>
 <span id="L9" class="LineNr"> 9 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L10" class="LineNr">10 </span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt; <a href='023check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">;</span>
+<span id="L10" class="LineNr">10 </span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt; <a href='031check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">;</span>
 <span id="L11" class="LineNr">11 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L12" class="LineNr">12 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='023check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L13" class="LineNr">13 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='023check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L14" class="LineNr">14 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='023check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L15" class="LineNr">15 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='023check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L16" class="LineNr">16 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='023check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L17" class="LineNr">17 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='023check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;scale&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L18" class="LineNr">18 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='023check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
-<span id="L19" class="LineNr">19 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='023check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
-<span id="L20" class="LineNr">20 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='023check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
+<span id="L12" class="LineNr">12 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L13" class="LineNr">13 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L14" class="LineNr">14 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L15" class="LineNr">15 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L16" class="LineNr">16 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L17" class="LineNr">17 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;scale&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L18" class="LineNr">18 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">3</span><span class="Delimiter">);</span>
+<span id="L19" class="LineNr">19 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L20" class="LineNr">20 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
 <span id="L21" class="LineNr">21 </span><span class="Comment">// no bound needed for disp32</span>
-<span id="L22" class="LineNr">22 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='023check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L22" class="LineNr">22 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">,</span> <span class="Constant">1</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
 <span id="L23" class="LineNr">23 </span><span class="Comment">// no bound needed for imm32</span>
 <span id="L24" class="LineNr">24 </span>
-<span id="L25" class="LineNr">25 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L25" class="LineNr">25 </span><span class="Delimiter">:(before &quot;End Transforms&quot;)</span>
 <span id="L26" class="LineNr">26 </span><a href='011run.cc.html#L184'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>check_operand_bounds<span class="Delimiter">);</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> check_operand_bounds<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">const</span><span class="Comment">*/</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L29" class="LineNr">29 </span>  <a href='003trace.cc.html#L189'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L30" class="LineNr">30 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L31" class="LineNr">31 </span>  <span class="Normal">const</span> segment&amp; code = p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L32" class="LineNr">32 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L33" class="LineNr">33 </span>    <span class="Normal">const</span> line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L34" class="LineNr">34 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <a href='022check_instruction.cc.html#L326'>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#L109'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
-<span id="L35" class="LineNr">35 </span>      check_operand_bounds<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span>
-<span id="L36" class="LineNr">36 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L208'>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="L29" class="LineNr">29 </span>  <a href='003trace.cc.html#L190'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L30" class="LineNr">30 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L31" class="LineNr">31 </span>  <span class="Normal">const</span> segment&amp; code = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L32" class="LineNr">32 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L33" class="LineNr">33 </span>    <span class="Normal">const</span> line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L34" class="LineNr">34 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <a href='030check_operands.cc.html#L326'>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#L111'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
+<span id="L35" class="LineNr">35 </span>      check_operand_bounds<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span>
+<span id="L36" class="LineNr">36 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L210'>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="L37" class="LineNr">37 </span>  <span class="Delimiter">}</span>
 <span id="L38" class="LineNr">38 </span><span class="Delimiter">}</span>
 <span id="L39" class="LineNr">39 </span>
 <span id="L40" class="LineNr">40 </span><span class="Normal">void</span> check_operand_bounds<span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L41" class="LineNr">41 </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='023check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='023check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">.</span><a href='003trace.cc.html#L213'>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">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;::iterator p = <a href='031check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='031check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L42" class="LineNr">42 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_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="L43" class="LineNr">43 </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#L115'>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="L44" class="LineNr">44 </span>    <span class="Normal">int32_t</span> x = <a href='023check_operand_bounds.cc.html#L65'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">);</span>
+<span id="L43" class="LineNr">43 </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#L117'>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="L44" class="LineNr">44 </span>    <span class="Normal">int32_t</span> x = <a href='031check_operand_bounds.cc.html#L65'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">);</span>
 <span id="L45" class="LineNr">45 </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="L46" class="LineNr">46 </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="L47" class="LineNr">47 </span>        <a href='003trace.cc.html#L196'>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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L47" class="LineNr">47 </span>        <a href='003trace.cc.html#L197'>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#L215'>end</a><span class="Delimiter">();</span>
 <span id="L48" class="LineNr">48 </span>    <span class="Delimiter">}</span>
 <span id="L49" class="LineNr">49 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L50" class="LineNr">50 </span>      <span class="Comment">// hacky? assuming bound is a power of 2</span>
 <span id="L51" class="LineNr">51 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>x &lt; -<span class="Constant">1</span>*<span class="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second/<span class="Constant">2</span><span class="Delimiter">))</span>
-<span id="L52" class="LineNr">52 </span>        <a href='003trace.cc.html#L196'>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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L52" class="LineNr">52 </span>        <a href='003trace.cc.html#L197'>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#L215'>end</a><span class="Delimiter">();</span>
 <span id="L53" class="LineNr">53 </span>    <span class="Delimiter">}</span>
 <span id="L54" class="LineNr">54 </span>  <span class="Delimiter">}</span>
 <span id="L55" class="LineNr">55 </span><span class="Delimiter">}</span>
 <span id="L56" class="LineNr">56 </span>
-<span id="L57" class="LineNr">57 </span><span class="Normal">bool</span> <a href='023check_operand_bounds.cc.html#L57'>is_hex_int</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L57" class="LineNr">57 </span><span class="Normal">bool</span> <a href='031check_operand_bounds.cc.html#L57'>is_hex_int</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L58" class="LineNr">58 </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"> false</span><span class="Delimiter">;</span>
 <span id="L59" class="LineNr">59 </span>  <span class="Normal">size_t</span> pos = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L60" class="LineNr">60 </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> || 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> pos++<span class="Delimiter">;</span>
@@ -125,12 +125,12 @@ if ('onhashchange' in window) {
 <span id="L62" class="LineNr">62 </span>  <span class="Identifier">return</span> s<span class="Delimiter">.</span>find_first_not_of<span class="Delimiter">(</span><span class="Constant">&quot;0123456789abcdefABCDEF&quot;</span><span class="Delimiter">,</span> pos<span class="Delimiter">)</span> == string::npos<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">int32_t</span> <a href='023check_operand_bounds.cc.html#L65'>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="L65" class="LineNr">65 </span><span class="Normal">int32_t</span> <a href='031check_operand_bounds.cc.html#L65'>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="L66" class="LineNr">66 </span>  istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
 <span id="L67" class="LineNr">67 </span>  <span class="Normal">int32_t</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L68" class="LineNr">68 </span>  in &gt;&gt; std::hex &gt;&gt; result<span class="Delimiter">;</span>
 <span id="L69" class="LineNr">69 </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="L70" class="LineNr">70 </span>    <a href='003trace.cc.html#L196'>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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L70" class="LineNr">70 </span>    <a href='003trace.cc.html#L197'>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#L215'>end</a><span class="Delimiter">();</span>
 <span id="L71" class="LineNr">71 </span>    <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L72" class="LineNr">72 </span>  <span class="Delimiter">}</span>
 <span id="L73" class="LineNr">73 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
diff --git a/html/subx/024pack_operands.cc.html b/html/subx/032pack_operands.cc.html
index ced3cdc2..fd74e1e4 100644
--- a/html/subx/024pack_operands.cc.html
+++ b/html/subx/032pack_operands.cc.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/024pack_operands.cc</title>
+<title>Mu - subx/032pack_operands.cc</title>
 <meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
@@ -62,10 +62,10 @@ if ('onhashchange' in window) {
 <span id="L3" class="LineNr">  3 </span>
 <span id="L4" class="LineNr">  4 </span><span class="Delimiter">:(scenario pack_immediate_constants)</span>
 <span id="L5" class="LineNr">  5 </span>== <span class="Constant">0x1</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment"># instruction                     effective address                                           operand     displacement    immediate</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment"># op          subop               mod             rm32          base      index     scale     r32</span>
-<span id="L8" class="LineNr">  8 </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="L9" class="LineNr">  9 </span>  bb                                                                                                                      <span class="Constant">0x2a</span>/imm32        <span class="Comment"># copy 42 to EBX</span>
+<span id="L6" class="LineNr">  6 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L7" class="LineNr">  7 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L8" class="LineNr">  8 </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="L9" class="LineNr">  9 </span>  bb                                                                                                                              <span class="Constant">0x2a</span>/imm32        <span class="Comment"># copy 42 to EBX</span>
 <span id="L10" class="LineNr"> 10 </span><span class="traceContains">+transform: packing instruction 'bb 0x2a/imm32'</span>
 <span id="L11" class="LineNr"> 11 </span><span class="traceContains">+transform: instruction after packing: 'bb 2a 00 00 00'</span>
 <span id="L12" class="LineNr"> 12 </span><span class="traceContains">+run: copy <a href='011run.cc.html#L253'>imm32</a> 0x0000002a to <a href='010vm.cc.html#L16'>EBX</a></span>
@@ -87,10 +87,10 @@ if ('onhashchange' in window) {
 <span id="L28" class="LineNr"> 28 </span>
 <span id="L29" class="LineNr"> 29 </span><span class="Delimiter">:(scenario pack_modrm_imm32)</span>
 <span id="L30" class="LineNr"> 30 </span>== <span class="Constant">0x1</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Comment"># instruction                     effective address                                           operand     displacement    immediate</span>
-<span id="L32" class="LineNr"> 32 </span><span class="Comment"># op          subop               mod             rm32          base      index     scale     r32</span>
-<span id="L33" class="LineNr"> 33 </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="L34" class="LineNr"> 34 </span>  <span class="Constant">81</span>          <span class="Constant">0</span>/add/subop         <span class="Constant">3</span>/mod/direct    <span class="Constant">3</span>/ebx/rm32                                                              <span class="Constant">1</span>/imm32           <span class="Comment"># add 1 to EBX</span>
+<span id="L31" class="LineNr"> 31 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L32" class="LineNr"> 32 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L33" class="LineNr"> 33 </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="L34" class="LineNr"> 34 </span>  <span class="Constant">81</span>          <span class="Constant">0</span>/add/subop         <span class="Constant">3</span>/mod/direct    <span class="Constant">3</span>/ebx/rm32                                                                      <span class="Constant">1</span>/imm32           <span class="Comment"># add 1 to EBX</span>
 <span id="L35" class="LineNr"> 35 </span><span class="traceContains">+transform: packing instruction '81 0/add/subop 3/mod/direct 3/ebx/rm32 1/imm32'</span>
 <span id="L36" class="LineNr"> 36 </span><span class="traceContains">+transform: instruction after packing: '81 c3 01 00 00 00'</span>
 <span id="L37" class="LineNr"> 37 </span>
@@ -100,92 +100,92 @@ if ('onhashchange' in window) {
 <span id="L41" class="LineNr"> 41 </span><span class="traceContains">+transform: packing instruction 'b9 0x080490a7/imm32'</span>
 <span id="L42" class="LineNr"> 42 </span><span class="traceContains">+transform: instruction after packing: 'b9 a7 90 04 08'</span>
 <span id="L43" class="LineNr"> 43 </span>
-<span id="L44" class="LineNr"> 44 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L44" class="LineNr"> 44 </span><span class="Delimiter">:(before &quot;End Transforms&quot;)</span>
 <span id="L45" class="LineNr"> 45 </span><a href='011run.cc.html#L184'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pack_operands<span class="Delimiter">);</span>
 <span id="L46" class="LineNr"> 46 </span>
 <span id="L47" class="LineNr"> 47 </span><span class="Delimiter">:(code)</span>
 <span id="L48" class="LineNr"> 48 </span><span class="Normal">void</span> pack_operands<span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L49" class="LineNr"> 49 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- pack operands&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L50" class="LineNr"> 50 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L51" class="LineNr"> 51 </span>  segment&amp; code = p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L52" class="LineNr"> 52 </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>code<span class="Delimiter">.</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L53" class="LineNr"> 53 </span>    line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L54" class="LineNr"> 54 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='022check_instruction.cc.html#L337'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L55" class="LineNr"> 55 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;packing instruction '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">with metadata</span><span class="Comment">*/</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L49" class="LineNr"> 49 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- pack operands&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L50" class="LineNr"> 50 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L51" class="LineNr"> 51 </span>  segment&amp; code = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L52" class="LineNr"> 52 </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>code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L53" class="LineNr"> 53 </span>    line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L54" class="LineNr"> 54 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030check_operands.cc.html#L337'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L55" class="LineNr"> 55 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;packing instruction '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">with metadata</span><span class="Comment">*/</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L56" class="LineNr"> 56 </span>    pack_operands<span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L57" class="LineNr"> 57 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after packing: '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">without metadata</span><span class="Comment">*/</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L57" class="LineNr"> 57 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after packing: '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">without metadata</span><span class="Comment">*/</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L58" class="LineNr"> 58 </span>  <span class="Delimiter">}</span>
 <span id="L59" class="LineNr"> 59 </span><span class="Delimiter">}</span>
 <span id="L60" class="LineNr"> 60 </span>
 <span id="L61" class="LineNr"> 61 </span><span class="Normal">void</span> pack_operands<span class="Delimiter">(</span>line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L62" class="LineNr"> 62 </span>  <a href='011run.cc.html#L108'>line</a> new_inst<span class="Delimiter">;</span>
-<span id="L63" class="LineNr"> 63 </span>  <a href='024pack_operands.cc.html#L71'>add_opcodes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
-<span id="L64" class="LineNr"> 64 </span>  <a href='024pack_operands.cc.html#L79'>add_modrm_byte</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
-<span id="L65" class="LineNr"> 65 </span>  <a href='024pack_operands.cc.html#L105'>add_sib_byte</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
-<span id="L66" class="LineNr"> 66 </span>  <a href='024pack_operands.cc.html#L127'>add_disp_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
-<span id="L67" class="LineNr"> 67 </span>  <a href='024pack_operands.cc.html#L139'>add_imm_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
-<span id="L68" class="LineNr"> 68 </span>  inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">);</span>
+<span id="L62" class="LineNr"> 62 </span>  <a href='011run.cc.html#L110'>line</a> new_inst<span class="Delimiter">;</span>
+<span id="L63" class="LineNr"> 63 </span>  <a href='032pack_operands.cc.html#L71'>add_opcodes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
+<span id="L64" class="LineNr"> 64 </span>  <a href='032pack_operands.cc.html#L79'>add_modrm_byte</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
+<span id="L65" class="LineNr"> 65 </span>  <a href='032pack_operands.cc.html#L105'>add_sib_byte</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
+<span id="L66" class="LineNr"> 66 </span>  <a href='032pack_operands.cc.html#L127'>add_disp_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
+<span id="L67" class="LineNr"> 67 </span>  <a href='032pack_operands.cc.html#L139'>add_imm_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
+<span id="L68" class="LineNr"> 68 </span>  inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><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><span class="Normal">void</span> <a href='024pack_operands.cc.html#L71'>add_opcodes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L72" class="LineNr"> 72 </span>  out<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
-<span id="L73" class="LineNr"> 73 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L109'>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#L115'>data</a> == <span class="Constant">&quot;0f&quot;</span> || in<span class="Delimiter">.</span><a href='011run.cc.html#L109'>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#L115'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span>
-<span id="L74" class="LineNr"> 74 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
-<span id="L75" class="LineNr"> 75 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L109'>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#L115'>data</a> == <span class="Constant">&quot;f3&quot;</span> &amp;&amp; in<span class="Delimiter">.</span><a href='011run.cc.html#L109'>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#L115'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
-<span id="L76" class="LineNr"> 76 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
+<span id="L71" class="LineNr"> 71 </span><span class="Normal">void</span> <a href='032pack_operands.cc.html#L71'>add_opcodes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L72" class="LineNr"> 72 </span>  out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
+<span id="L73" class="LineNr"> 73 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>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#L117'>data</a> == <span class="Constant">&quot;0f&quot;</span> || in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>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#L117'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span>
+<span id="L74" class="LineNr"> 74 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
+<span id="L75" class="LineNr"> 75 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>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#L117'>data</a> == <span class="Constant">&quot;f3&quot;</span> &amp;&amp; in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>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#L117'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
+<span id="L76" class="LineNr"> 76 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</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="Normal">void</span> <a href='024pack_operands.cc.html#L79'>add_modrm_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L79" class="LineNr"> 79 </span><span class="Normal">void</span> <a href='032pack_operands.cc.html#L79'>add_modrm_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L80" class="LineNr"> 80 </span>  <span class="Normal">uint8_t</span> mod=<span class="Constant">0</span><span class="Delimiter">,</span> reg_subop=<span class="Constant">0</span><span class="Delimiter">,</span> rm32=<span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L81" class="LineNr"> 81 </span>  <span class="Normal">bool</span> emit =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L82" class="LineNr"> 82 </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#L109'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L83" class="LineNr"> 83 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L82" class="LineNr"> 82 </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#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L83" class="LineNr"> 83 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L84" class="LineNr"> 84 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_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="L85" class="LineNr"> 85 </span>      mod = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">);</span>
+<span id="L85" class="LineNr"> 85 </span>      mod = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">);</span>
 <span id="L86" class="LineNr"> 86 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L87" class="LineNr"> 87 </span>    <span class="Delimiter">}</span>
 <span id="L88" class="LineNr"> 88 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_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="L89" class="LineNr"> 89 </span>      rm32 = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">);</span>
+<span id="L89" class="LineNr"> 89 </span>      rm32 = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">);</span>
 <span id="L90" class="LineNr"> 90 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L91" class="LineNr"> 91 </span>    <span class="Delimiter">}</span>
 <span id="L92" class="LineNr"> 92 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_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="L93" class="LineNr"> 93 </span>      reg_subop = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">);</span>
+<span id="L93" class="LineNr"> 93 </span>      reg_subop = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">);</span>
 <span id="L94" class="LineNr"> 94 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L95" class="LineNr"> 95 </span>    <span class="Delimiter">}</span>
 <span id="L96" class="LineNr"> 96 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_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="L97" class="LineNr"> 97 </span>      reg_subop = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">);</span>
+<span id="L97" class="LineNr"> 97 </span>      reg_subop = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">);</span>
 <span id="L98" class="LineNr"> 98 </span>      emit =<span class="Constant"> true</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 class="Normal">if</span> <span class="Delimiter">(</span>emit<span class="Delimiter">)</span>
-<span id="L102" class="LineNr">102 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='024pack_operands.cc.html#L166'>hex_byte_text</a><span class="Delimiter">((</span>mod &lt;&lt; <span class="Constant">6</span><span class="Delimiter">)</span> | <span class="Delimiter">(</span>reg_subop &lt;&lt; <span class="Constant">3</span><span class="Delimiter">)</span> | rm32<span class="Delimiter">));</span>
+<span id="L102" class="LineNr">102 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='032pack_operands.cc.html#L166'>hex_byte_text</a><span class="Delimiter">((</span>mod &lt;&lt; <span class="Constant">6</span><span class="Delimiter">)</span> | <span class="Delimiter">(</span>reg_subop &lt;&lt; <span class="Constant">3</span><span class="Delimiter">)</span> | rm32<span class="Delimiter">));</span>
 <span id="L103" class="LineNr">103 </span><span class="Delimiter">}</span>
 <span id="L104" class="LineNr">104 </span>
-<span id="L105" class="LineNr">105 </span><span class="Normal">void</span> <a href='024pack_operands.cc.html#L105'>add_sib_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L105" class="LineNr">105 </span><span class="Normal">void</span> <a href='032pack_operands.cc.html#L105'>add_sib_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L106" class="LineNr">106 </span>  <span class="Normal">uint8_t</span> scale=<span class="Constant">0</span><span class="Delimiter">,</span> index=<span class="Constant">0</span><span class="Delimiter">,</span> base=<span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L107" class="LineNr">107 </span>  <span class="Normal">bool</span> emit =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L108" class="LineNr">108 </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#L109'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L109" class="LineNr">109 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L108" class="LineNr">108 </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#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L109" class="LineNr">109 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L110" class="LineNr">110 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_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="L111" class="LineNr">111 </span>      scale = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">);</span>
+<span id="L111" class="LineNr">111 </span>      scale = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">);</span>
 <span id="L112" class="LineNr">112 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L113" class="LineNr">113 </span>    <span class="Delimiter">}</span>
 <span id="L114" class="LineNr">114 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_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="L115" class="LineNr">115 </span>      index = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">);</span>
+<span id="L115" class="LineNr">115 </span>      index = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">);</span>
 <span id="L116" class="LineNr">116 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L117" class="LineNr">117 </span>    <span class="Delimiter">}</span>
 <span id="L118" class="LineNr">118 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_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="L119" class="LineNr">119 </span>      base = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">);</span>
+<span id="L119" class="LineNr">119 </span>      base = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">);</span>
 <span id="L120" class="LineNr">120 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L121" class="LineNr">121 </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="Normal">if</span> <span class="Delimiter">(</span>emit<span class="Delimiter">)</span>
-<span id="L124" class="LineNr">124 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='024pack_operands.cc.html#L166'>hex_byte_text</a><span class="Delimiter">((</span>scale &lt;&lt; <span class="Constant">6</span><span class="Delimiter">)</span> | <span class="Delimiter">(</span>index &lt;&lt; <span class="Constant">3</span><span class="Delimiter">)</span> | base<span class="Delimiter">));</span>
+<span id="L124" class="LineNr">124 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='032pack_operands.cc.html#L166'>hex_byte_text</a><span class="Delimiter">((</span>scale &lt;&lt; <span class="Constant">6</span><span class="Delimiter">)</span> | <span class="Delimiter">(</span>index &lt;&lt; <span class="Constant">3</span><span class="Delimiter">)</span> | base<span class="Delimiter">));</span>
 <span id="L125" class="LineNr">125 </span><span class="Delimiter">}</span>
 <span id="L126" class="LineNr">126 </span>
-<span id="L127" class="LineNr">127 </span><span class="Normal">void</span> <a href='024pack_operands.cc.html#L127'>add_disp_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L128" class="LineNr">128 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L129" class="LineNr">129 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </span><span class="Normal">void</span> <a href='032pack_operands.cc.html#L127'>add_disp_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L128" class="LineNr">128 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L129" class="LineNr">129 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L130" class="LineNr">130 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">))</span>
 <span id="L131" class="LineNr">131 </span>      emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L132" class="LineNr">132 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">))</span>
@@ -195,9 +195,9 @@ if ('onhashchange' in window) {
 <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 id="L139" class="LineNr">139 </span><span class="Normal">void</span> <a href='024pack_operands.cc.html#L139'>add_imm_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L140" class="LineNr">140 </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#L109'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L141" class="LineNr">141 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L139" class="LineNr">139 </span><span class="Normal">void</span> <a href='032pack_operands.cc.html#L139'>add_imm_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L140" class="LineNr">140 </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#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L141" class="LineNr">141 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L142" class="LineNr">142 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">))</span>
 <span id="L143" class="LineNr">143 </span>      emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L144" class="LineNr">144 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span>
@@ -207,27 +207,27 @@ if ('onhashchange' in window) {
 <span id="L148" class="LineNr">148 </span>
 <span id="L149" class="LineNr">149 </span><span class="Normal">void</span> emit_hex_bytes<span class="Delimiter">(</span>line&amp; out<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; w<span class="Delimiter">,</span> <span class="Normal">int</span> num<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L150" class="LineNr">150 </span>  assert<span class="Delimiter">(</span>num &lt;= <span class="Constant">4</span><span class="Delimiter">);</span>
-<span id="L151" class="LineNr">151 </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#L115'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L152" class="LineNr">152 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>w<span class="Delimiter">);</span>
+<span id="L151" class="LineNr">151 </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#L117'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L152" class="LineNr">152 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>w<span class="Delimiter">);</span>
 <span id="L153" class="LineNr">153 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L154" class="LineNr">154 </span>  <span class="Delimiter">}</span>
-<span id="L155" class="LineNr">155 </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='023check_operand_bounds.cc.html#L65'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">)),</span> num<span class="Delimiter">);</span>
+<span id="L155" class="LineNr">155 </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='031check_operand_bounds.cc.html#L65'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">)),</span> num<span class="Delimiter">);</span>
 <span id="L156" class="LineNr">156 </span><span class="Delimiter">}</span>
 <span id="L157" class="LineNr">157 </span>
 <span id="L158" class="LineNr">158 </span><span class="Normal">void</span> 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>
 <span id="L159" class="LineNr">159 </span>  assert<span class="Delimiter">(</span>num &lt;= <span class="Constant">4</span><span class="Delimiter">);</span>
 <span id="L160" class="LineNr">160 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; num<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L161" class="LineNr">161 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='024pack_operands.cc.html#L166'>hex_byte_text</a><span class="Delimiter">(</span>val &amp; <span class="Constant">0xff</span><span class="Delimiter">));</span>
+<span id="L161" class="LineNr">161 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='032pack_operands.cc.html#L166'>hex_byte_text</a><span class="Delimiter">(</span>val &amp; <span class="Constant">0xff</span><span class="Delimiter">));</span>
 <span id="L162" class="LineNr">162 </span>    val = val &gt;&gt; <span class="Constant">8</span><span class="Delimiter">;</span>
 <span id="L163" class="LineNr">163 </span>  <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><a href='011run.cc.html#L113'>word</a> <a href='024pack_operands.cc.html#L166'>hex_byte_text</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L166" class="LineNr">166 </span><a href='011run.cc.html#L115'>word</a> <a href='032pack_operands.cc.html#L166'>hex_byte_text</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L167" class="LineNr">167 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L168" class="LineNr">168 </span>  out &lt;&lt; <a href='010vm.cc.html#L227'>HEXBYTE</a> &lt;&lt; <a href='010vm.cc.html#L230'>NUM</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
-<span id="L169" class="LineNr">169 </span>  <a href='011run.cc.html#L113'>word</a> result<span class="Delimiter">;</span>
-<span id="L170" class="LineNr">170 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a> = out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L171" class="LineNr">171 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L114'>original</a> = out<span class="Delimiter">.</span>str<span class="Delimiter">()</span>+<span class="Constant">&quot;/auto&quot;</span><span class="Delimiter">;</span>
+<span id="L168" class="LineNr">168 </span>  out &lt;&lt; <a href='010vm.cc.html#L238'>HEXBYTE</a> &lt;&lt; <a href='010vm.cc.html#L241'>NUM</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
+<span id="L169" class="LineNr">169 </span>  <a href='011run.cc.html#L115'>word</a> result<span class="Delimiter">;</span>
+<span id="L170" class="LineNr">170 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a> = out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L171" class="LineNr">171 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L116'>original</a> = out<span class="Delimiter">.</span>str<span class="Delimiter">()</span>+<span class="Constant">&quot;/auto&quot;</span><span class="Delimiter">;</span>
 <span id="L172" class="LineNr">172 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L173" class="LineNr">173 </span><span class="Delimiter">}</span>
 <span id="L174" class="LineNr">174 </span>
@@ -235,42 +235,33 @@ if ('onhashchange' in window) {
 <span id="L176" class="LineNr">176 </span>  ostringstream out<span class="Delimiter">;</span>
 <span id="L177" class="LineNr">177 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L178" class="LineNr">178 </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="L179" class="LineNr">179 </span>    out &lt;&lt; in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">;</span>
+<span id="L179" class="LineNr">179 </span>    out &lt;&lt; in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">;</span>
 <span id="L180" class="LineNr">180 </span>  <span class="Delimiter">}</span>
 <span id="L181" class="LineNr">181 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<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="Comment">// helper</span>
-<span id="L185" class="LineNr">185 </span><span class="Normal">void</span> transform<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L186" class="LineNr">186 </span>  <a href='011run.cc.html#L94'>program</a> p<span class="Delimiter">;</span>
-<span id="L187" class="LineNr">187 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
-<span id="L188" class="LineNr">188 </span>  <a href='011run.cc.html#L122'>parse</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L189" class="LineNr">189 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L208'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L190" class="LineNr">190 </span>  transform<span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L191" class="LineNr">191 </span><span class="Delimiter">}</span>
-<span id="L192" class="LineNr">192 </span>
-<span id="L193" class="LineNr">193 </span><span class="Delimiter">:(scenario pack_immediate_constants_hex)</span>
-<span id="L194" class="LineNr">194 </span>== <span class="Constant">0x1</span>
-<span id="L195" class="LineNr">195 </span><span class="Comment"># instruction                     effective address                                           operand     displacement    immediate</span>
-<span id="L196" class="LineNr">196 </span><span class="Comment"># op          subop               mod             rm32          base      index     scale     r32</span>
-<span id="L197" class="LineNr">197 </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="L198" class="LineNr">198 </span>  bb                                                                                                                      <span class="Constant">0x2a</span>/imm32        <span class="Comment"># copy 42 to EBX</span>
-<span id="L199" class="LineNr">199 </span><span class="traceContains">+transform: packing instruction 'bb 0x2a/imm32'</span>
-<span id="L200" class="LineNr">200 </span><span class="traceContains">+transform: instruction after packing: 'bb 2a 00 00 00'</span>
-<span id="L201" class="LineNr">201 </span><span class="traceContains">+run: copy <a href='011run.cc.html#L253'>imm32</a> 0x0000002a to <a href='010vm.cc.html#L16'>EBX</a></span>
-<span id="L202" class="LineNr">202 </span>
-<span id="L203" class="LineNr">203 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L204" class="LineNr">204 </span><span class="Delimiter">:(scenario pack_silently_ignores_non_hex)</span>
-<span id="L205" class="LineNr">205 </span>== <span class="Constant">0x1</span>
-<span id="L206" class="LineNr">206 </span><span class="Comment"># instruction                     effective address                                           operand     displacement    immediate</span>
-<span id="L207" class="LineNr">207 </span><span class="Comment"># op          subop               mod             rm32          base      index     scale     r32</span>
-<span id="L208" class="LineNr">208 </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="L209" class="LineNr">209 </span>  bb                                                                                                                      foo/imm32         <span class="Comment"># copy foo to EBX</span>
-<span id="L210" class="LineNr">210 </span><span class="traceContains">+transform: packing instruction 'bb foo/imm32'</span>
-<span id="L211" class="LineNr">211 </span><span class="Comment"># no change (we're just not printing metadata to the trace)</span>
-<span id="L212" class="LineNr">212 </span><span class="traceContains">+transform: instruction after packing: 'bb foo'</span>
-<span id="L213" class="LineNr">213 </span>$error: <span class="Constant">0</span>
-<span id="L214" class="LineNr">214 </span><span class="Delimiter">:(scenarios run)</span>
+<span id="L184" class="LineNr">184 </span><span class="Delimiter">:(scenario pack_immediate_constants_hex)</span>
+<span id="L185" class="LineNr">185 </span>== <span class="Constant">0x1</span>
+<span id="L186" class="LineNr">186 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L187" class="LineNr">187 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L188" class="LineNr">188 </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="L189" class="LineNr">189 </span>  bb                                                                                                                              <span class="Constant">0x2a</span>/imm32        <span class="Comment"># copy 42 to EBX</span>
+<span id="L190" class="LineNr">190 </span><span class="traceContains">+transform: packing instruction 'bb 0x2a/imm32'</span>
+<span id="L191" class="LineNr">191 </span><span class="traceContains">+transform: instruction after packing: 'bb 2a 00 00 00'</span>
+<span id="L192" class="LineNr">192 </span><span class="traceContains">+run: copy <a href='011run.cc.html#L253'>imm32</a> 0x0000002a to <a href='010vm.cc.html#L16'>EBX</a></span>
+<span id="L193" class="LineNr">193 </span>
+<span id="L194" class="LineNr">194 </span><span class="Delimiter">:(scenarios transform)</span>
+<span id="L195" class="LineNr">195 </span><span class="Delimiter">:(scenario pack_silently_ignores_non_hex)</span>
+<span id="L196" class="LineNr">196 </span>== <span class="Constant">0x1</span>
+<span id="L197" class="LineNr">197 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L198" class="LineNr">198 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L199" class="LineNr">199 </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="L200" class="LineNr">200 </span>  bb                                                                                                                              foo/imm32         <span class="Comment"># copy foo to EBX</span>
+<span id="L201" class="LineNr">201 </span><span class="traceContains">+transform: packing instruction 'bb foo/imm32'</span>
+<span id="L202" class="LineNr">202 </span><span class="Comment"># no change (we're just not printing metadata to the trace)</span>
+<span id="L203" class="LineNr">203 </span><span class="traceContains">+transform: instruction after packing: 'bb foo'</span>
+<span id="L204" class="LineNr">204 </span>$error: <span class="Constant">0</span>
+<span id="L205" class="LineNr">205 </span><span class="Delimiter">:(scenarios run)</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/025non_code_segment.cc.html b/html/subx/033non_code_segment.cc.html
index 75e3d182..cd4efdd5 100644
--- a/html/subx/025non_code_segment.cc.html
+++ b/html/subx/033non_code_segment.cc.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/025non_code_segment.cc</title>
+<title>Mu - subx/033non_code_segment.cc</title>
 <meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
@@ -69,21 +69,21 @@ if ('onhashchange' in window) {
 <span id="L8" class="LineNr"> 8 </span>cd <span class="Constant">12</span>/imm8
 <span id="L9" class="LineNr"> 9 </span><span class="traceContains">+error: 12/imm8: metadata imm8 is only allowed in the (first) code segment</span>
 <span id="L10" class="LineNr">10 </span>
-<span id="L11" class="LineNr">11 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L12" class="LineNr">12 </span><a href='011run.cc.html#L184'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='025non_code_segment.cc.html#L14'>ensure_operands_only_in_code_segments</a><span class="Delimiter">);</span>
+<span id="L11" class="LineNr">11 </span><span class="Delimiter">:(before &quot;End Transforms&quot;)</span>
+<span id="L12" class="LineNr">12 </span><a href='011run.cc.html#L184'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='033non_code_segment.cc.html#L14'>ensure_operands_only_in_code_segments</a><span class="Delimiter">);</span>
 <span id="L13" class="LineNr">13 </span><span class="Delimiter">:(code)</span>
-<span id="L14" class="LineNr">14 </span><span class="Normal">void</span> <a href='025non_code_segment.cc.html#L14'>ensure_operands_only_in_code_segments</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">const</span><span class="Comment">*/</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L15" class="LineNr">15 </span>  <a href='003trace.cc.html#L189'>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;-- ensure operands only in code segments&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L16" class="LineNr">16 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L17" class="LineNr">17 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip code 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#L95'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L18" class="LineNr">18 </span>    <span class="Normal">const</span> segment&amp; seg = p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L19" class="LineNr">19 </span>    <span class="Normal">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#L104'>lines</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L20" class="LineNr">20 </span>      <span class="Normal">const</span> line&amp; l = seg<span class="Delimiter">.</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L21" class="LineNr">21 </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#L109'>words</a><span class="Delimiter">);</span>  ++k<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L22" class="LineNr">22 </span>        <span class="Normal">const</span> word&amp; w = l<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>k<span class="Delimiter">);</span>
-<span id="L23" class="LineNr">23 </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='023check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='023check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L14" class="LineNr">14 </span><span class="Normal">void</span> <a href='033non_code_segment.cc.html#L14'>ensure_operands_only_in_code_segments</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">const</span><span class="Comment">*/</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L15" class="LineNr">15 </span>  <a href='003trace.cc.html#L190'>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;-- ensure operands only in code segments&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L16" class="LineNr">16 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L17" class="LineNr">17 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip code 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#L97'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L18" class="LineNr">18 </span>    <span class="Normal">const</span> segment&amp; seg = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L19" class="LineNr">19 </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#L106'>lines</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L20" class="LineNr">20 </span>      <span class="Normal">const</span> line&amp; l = seg<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L21" class="LineNr">21 </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#L111'>words</a><span class="Delimiter">);</span>  ++k<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L22" class="LineNr">22 </span>        <span class="Normal">const</span> word&amp; w = l<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>k<span class="Delimiter">);</span>
+<span id="L23" class="LineNr">23 </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='031check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='031check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
 <span id="L24" class="LineNr">24 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>w<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span>
-<span id="L25" class="LineNr">25 </span>            <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; w<span class="Delimiter">.</span><a href='011run.cc.html#L114'>original</a> &lt;&lt; <span class="Constant">&quot;: metadata &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot; is only allowed in the (first) code segment</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L25" class="LineNr">25 </span>            <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; w<span class="Delimiter">.</span><a href='011run.cc.html#L116'>original</a> &lt;&lt; <span class="Constant">&quot;: metadata &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot; is only allowed in the (first) code segment</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L26" class="LineNr">26 </span>      <span class="Delimiter">}</span>
 <span id="L27" class="LineNr">27 </span>    <span class="Delimiter">}</span>
 <span id="L28" class="LineNr">28 </span>  <span class="Delimiter">}</span>
diff --git a/html/subx/026labels.cc.html b/html/subx/034labels.cc.html
index ffd2f1e5..d3b11f0d 100644
--- a/html/subx/026labels.cc.html
+++ b/html/subx/034labels.cc.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/026labels.cc</title>
+<title>Mu - subx/034labels.cc</title>
 <meta name="Generator" content="Vim/7.4">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
@@ -65,94 +65,94 @@ if ('onhashchange' in window) {
 <span id="L4" class="LineNr">  4 </span><span class="Delimiter">:(scenarios transform)</span>
 <span id="L5" class="LineNr">  5 </span><span class="Delimiter">:(scenario map_label)</span>
 <span id="L6" class="LineNr">  6 </span>== <span class="Constant">0x1</span>
-<span id="L7" class="LineNr">  7 </span>          <span class="Comment"># instruction                     effective address                                           operand     displacement    immediate</span>
-<span id="L8" class="LineNr">  8 </span>          <span class="Comment"># op          subop               mod             rm32          base      index     scale     r32</span>
-<span id="L9" class="LineNr">  9 </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="L7" class="LineNr">  7 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L8" class="LineNr">  8 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L9" class="LineNr">  9 </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="L10" class="LineNr"> 10 </span><span class="Normal">loop</span>:
-<span id="L11" class="LineNr"> 11 </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="L11" class="LineNr"> 11 </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="L12" class="LineNr"> 12 </span><span class="traceContains">+transform: <a href='003trace.cc.html#L73'>label</a> 'loop' is at address 1</span>
 <span id="L13" class="LineNr"> 13 </span>
-<span id="L14" class="LineNr"> 14 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L15" class="LineNr"> 15 </span><a href='011run.cc.html#L184'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='026labels.cc.html#L18'>rewrite_labels</a><span class="Delimiter">);</span>
+<span id="L14" class="LineNr"> 14 </span><span class="Delimiter">:(before &quot;End Transforms&quot;)</span>
+<span id="L15" class="LineNr"> 15 </span><a href='011run.cc.html#L184'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='034labels.cc.html#L18'>rewrite_labels</a><span class="Delimiter">);</span>
 <span id="L16" class="LineNr"> 16 </span>
 <span id="L17" class="LineNr"> 17 </span><span class="Delimiter">:(code)</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Normal">void</span> <a href='026labels.cc.html#L18'>rewrite_labels</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L19" class="LineNr"> 19 </span>  <a href='003trace.cc.html#L189'>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#L213'>end</a><span class="Delimiter">();</span>
-<span id="L20" class="LineNr"> 20 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L21" class="LineNr"> 21 </span>  segment&amp; code = p<span class="Delimiter">.</span><a href='011run.cc.html#L95'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L18" class="LineNr"> 18 </span><span class="Normal">void</span> <a href='034labels.cc.html#L18'>rewrite_labels</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L19" class="LineNr"> 19 </span>  <a href='003trace.cc.html#L190'>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#L215'>end</a><span class="Delimiter">();</span>
+<span id="L20" class="LineNr"> 20 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L21" class="LineNr"> 21 </span>  segment&amp; code = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L22" class="LineNr"> 22 </span>  map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt; address<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="L23" class="LineNr"> 23 </span>  <a href='026labels.cc.html#L30'>compute_addresses_for_labels</a><span class="Delimiter">(</span>code<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L208'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L25" class="LineNr"> 25 </span>  <a href='026labels.cc.html#L64'>drop_labels</a><span class="Delimiter">(</span>code<span class="Delimiter">);</span>
-<span id="L26" class="LineNr"> 26 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L208'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L27" class="LineNr"> 27 </span>  <a href='026labels.cc.html#L76'>replace_labels_with_addresses</a><span class="Delimiter">(</span>code<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
+<span id="L23" class="LineNr"> 23 </span>  <a href='034labels.cc.html#L30'>compute_addresses_for_labels</a><span class="Delimiter">(</span>code<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L210'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L25" class="LineNr"> 25 </span>  <a href='034labels.cc.html#L64'>drop_labels</a><span class="Delimiter">(</span>code<span class="Delimiter">);</span>
+<span id="L26" class="LineNr"> 26 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L210'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L27" class="LineNr"> 27 </span>  <a href='034labels.cc.html#L76'>replace_labels_with_addresses</a><span class="Delimiter">(</span>code<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
 <span id="L28" class="LineNr"> 28 </span><span class="Delimiter">}</span>
 <span id="L29" class="LineNr"> 29 </span>
-<span id="L30" class="LineNr"> 30 </span><span class="Normal">void</span> <a href='026labels.cc.html#L30'>compute_addresses_for_labels</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; code<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L30" class="LineNr"> 30 </span><span class="Normal">void</span> <a href='034labels.cc.html#L30'>compute_addresses_for_labels</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; code<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L31" class="LineNr"> 31 </span>  <span class="Normal">int</span> current_byte = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L33" class="LineNr"> 33 </span>    <span class="Normal">const</span> line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L34" class="LineNr"> 34 </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#L109'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L35" class="LineNr"> 35 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<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> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L33" class="LineNr"> 33 </span>    <span class="Normal">const</span> line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L34" class="LineNr"> 34 </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#L111'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L35" class="LineNr"> 35 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
 <span id="L36" class="LineNr"> 36 </span>      <span class="Comment">// hack: if we have any operand metadata left after previous transforms,</span>
 <span id="L37" class="LineNr"> 37 </span>      <span class="Comment">// deduce its size</span>
 <span id="L38" class="LineNr"> 38 </span>      <span class="Comment">// Maybe we should just move this transform to before instruction</span>
 <span id="L39" class="LineNr"> 39 </span>      <span class="Comment">// packing, and deduce the size of *all* operands. But then we'll also</span>
 <span id="L40" class="LineNr"> 40 </span>      <span class="Comment">// have to deal with bitfields.</span>
 <span id="L41" class="LineNr"> 41 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span> || has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L42" class="LineNr"> 42 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">)</span>
-<span id="L43" class="LineNr"> 43 </span>          <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': don't use ':' when jumping to labels</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L42" class="LineNr"> 42 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">)</span>
+<span id="L43" class="LineNr"> 43 </span>          <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': don't use ':' when jumping to labels</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L44" class="LineNr"> 44 </span>        current_byte += <span class="Constant">4</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">// automatically handle /disp8 and /imm8 here</span>
-<span id="L47" class="LineNr"> 47 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L47" class="LineNr"> 47 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L48" class="LineNr"> 48 </span>        ++current_byte<span class="Delimiter">;</span>
 <span id="L49" class="LineNr"> 49 </span>      <span class="Delimiter">}</span>
 <span id="L50" class="LineNr"> 50 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L51" class="LineNr"> 51 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='022check_instruction.cc.html#L344'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
-<span id="L52" class="LineNr"> 52 </span>          <a href='003trace.cc.html#L196'>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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L51" class="LineNr"> 51 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030check_operands.cc.html#L344'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
+<span id="L52" class="LineNr"> 52 </span>          <a href='003trace.cc.html#L197'>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#L215'>end</a><span class="Delimiter">();</span>
 <span id="L53" class="LineNr"> 53 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
-<span id="L54" class="LineNr"> 54 </span>          <a href='003trace.cc.html#L196'>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#L113'>word</a> in a line.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
-<span id="L55" class="LineNr"> 55 </span>        string <a href='003trace.cc.html#L73'>label</a> = curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">)</span>-<span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L54" class="LineNr"> 54 </span>          <a href='003trace.cc.html#L197'>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#L115'>word</a> in a line.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
+<span id="L55" class="LineNr"> 55 </span>        string <a href='003trace.cc.html#L73'>label</a> = curr<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">)</span>-<span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L56" class="LineNr"> 56 </span>        <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> current_byte<span class="Delimiter">);</span>
-<span id="L57" class="LineNr"> 57 </span>        <a href='003trace.cc.html#L189'>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#L103'>start</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L213'>end</a><span class="Delimiter">();</span>
+<span id="L57" class="LineNr"> 57 </span>        <a href='003trace.cc.html#L190'>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#L105'>start</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L215'>end</a><span class="Delimiter">();</span>
 <span id="L58" class="LineNr"> 58 </span>        <span class="Comment">// no modifying current_byte; label definitions won't be in the final binary</span>
 <span id="L59" class="LineNr"> 59 </span>      <span class="Delimiter">}</span>
 <span id="L60" class="LineNr"> 60 </span>    <span class="Delimiter">}</span>
 <span id="L61" class="LineNr"> 61 </span>  <span class="Delimiter">}</span>
 <span id="L62" class="LineNr"> 62 </span><span class="Delimiter">}</span>
 <span id="L63" class="LineNr"> 63 </span>
-<span id="L64" class="LineNr"> 64 </span><span class="Normal">void</span> <a href='026labels.cc.html#L64'>drop_labels</a><span class="Delimiter">(</span>segment&amp; code<span class="Delimiter">)</span> <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>code<span class="Delimiter">.</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L66" class="LineNr"> 66 </span>    line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L67" class="LineNr"> 67 </span>    vector&lt;word&gt;::iterator new_end = remove_if<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">(),</span> <a href='026labels.cc.html#L72'>is_label</a><span class="Delimiter">);</span>
-<span id="L68" class="LineNr"> 68 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>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#L109'>words</a><span class="Delimiter">.</span><a href='003trace.cc.html#L213'>end</a><span class="Delimiter">());</span>
+<span id="L64" class="LineNr"> 64 </span><span class="Normal">void</span> <a href='034labels.cc.html#L64'>drop_labels</a><span class="Delimiter">(</span>segment&amp; code<span class="Delimiter">)</span> <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>code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L66" class="LineNr"> 66 </span>    line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L67" class="LineNr"> 67 </span>    vector&lt;word&gt;::iterator new_end = remove_if<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">(),</span> <a href='034labels.cc.html#L72'>is_label</a><span class="Delimiter">);</span>
+<span id="L68" class="LineNr"> 68 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>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#L111'>words</a><span class="Delimiter">.</span><a href='003trace.cc.html#L215'>end</a><span class="Delimiter">());</span>
 <span id="L69" class="LineNr"> 69 </span>  <span class="Delimiter">}</span>
 <span id="L70" class="LineNr"> 70 </span><span class="Delimiter">}</span>
 <span id="L71" class="LineNr"> 71 </span>
-<span id="L72" class="LineNr"> 72 </span><span class="Normal">bool</span> <a href='026labels.cc.html#L72'>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="L73" class="LineNr"> 73 </span>  <span class="Identifier">return</span> *w<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">;</span>
+<span id="L72" class="LineNr"> 72 </span><span class="Normal">bool</span> <a href='034labels.cc.html#L72'>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="L73" class="LineNr"> 73 </span>  <span class="Identifier">return</span> *w<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</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="Normal">void</span> <a href='026labels.cc.html#L76'>replace_labels_with_addresses</a><span class="Delimiter">(</span>segment&amp; code<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L76" class="LineNr"> 76 </span><span class="Normal">void</span> <a href='034labels.cc.html#L76'>replace_labels_with_addresses</a><span class="Delimiter">(</span>segment&amp; code<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L77" class="LineNr"> 77 </span>  <span class="Normal">int32_t</span> byte_next_instruction_starts_at = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L78" class="LineNr"> 78 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L79" class="LineNr"> 79 </span>    line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L104'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L80" class="LineNr"> 80 </span>    byte_next_instruction_starts_at += <a href='026labels.cc.html#L112'>num_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L81" class="LineNr"> 81 </span>    <a href='011run.cc.html#L108'>line</a> new_inst<span class="Delimiter">;</span>
-<span id="L82" class="LineNr"> 82 </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#L109'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L83" class="LineNr"> 83 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L84" class="LineNr"> 84 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L247'>contains_key</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L85" class="LineNr"> 85 </span>        <span class="Normal">int32_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span>get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">))</span> - byte_next_instruction_starts_at<span class="Delimiter">;</span>
+<span id="L78" class="LineNr"> 78 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L79" class="LineNr"> 79 </span>    line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L80" class="LineNr"> 80 </span>    byte_next_instruction_starts_at += <a href='034labels.cc.html#L112'>num_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L81" class="LineNr"> 81 </span>    <a href='011run.cc.html#L110'>line</a> new_inst<span class="Delimiter">;</span>
+<span id="L82" class="LineNr"> 82 </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#L111'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L83" class="LineNr"> 83 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L84" class="LineNr"> 84 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L247'>contains_key</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L85" class="LineNr"> 85 </span>        <span class="Normal">int32_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span>get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">))</span> - byte_next_instruction_starts_at<span class="Delimiter">;</span>
 <span id="L86" class="LineNr"> 86 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">)</span> || has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L87" class="LineNr"> 87 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>offset &gt; <span class="Constant">0xff</span> || offset &lt; -<span class="Constant">0x7f</span><span class="Delimiter">)</span>
-<span id="L88" class="LineNr"> 88 </span>            <a href='003trace.cc.html#L196'>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 distance &quot;</span> &lt;&lt; std::hex &lt;&lt; offset &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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L88" class="LineNr"> 88 </span>            <a href='003trace.cc.html#L197'>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 distance &quot;</span> &lt;&lt; std::hex &lt;&lt; offset &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#L215'>end</a><span class="Delimiter">();</span>
 <span id="L89" class="LineNr"> 89 </span>          <span class="Normal">else</span>
 <span id="L90" class="LineNr"> 90 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> offset<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L91" class="LineNr"> 91 </span>        <span class="Delimiter">}</span>
 <span id="L92" class="LineNr"> 92 </span>        <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_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="L93" class="LineNr"> 93 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>offset &gt; <span class="Constant">0xffff</span> || offset &lt; -<span class="Constant">0x7fff</span><span class="Delimiter">)</span>
-<span id="L94" class="LineNr"> 94 </span>            <a href='003trace.cc.html#L196'>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 distance &quot;</span> &lt;&lt; std::hex &lt;&lt; offset &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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L94" class="LineNr"> 94 </span>            <a href='003trace.cc.html#L197'>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 distance &quot;</span> &lt;&lt; std::hex &lt;&lt; offset &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#L215'>end</a><span class="Delimiter">();</span>
 <span id="L95" class="LineNr"> 95 </span>          <span class="Normal">else</span>
 <span id="L96" class="LineNr"> 96 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> offset<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L97" class="LineNr"> 97 </span>        <span class="Delimiter">}</span>
@@ -161,19 +161,19 @@ if ('onhashchange' in window) {
 <span id="L100" class="LineNr">100 </span>        <span class="Delimiter">}</span>
 <span id="L101" class="LineNr">101 </span>      <span class="Delimiter">}</span>
 <span id="L102" class="LineNr">102 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L103" class="LineNr">103 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L103" class="LineNr">103 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
 <span id="L104" class="LineNr">104 </span>      <span class="Delimiter">}</span>
 <span id="L105" class="LineNr">105 </span>    <span class="Delimiter">}</span>
-<span id="L106" class="LineNr">106 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">);</span>
-<span id="L107" class="LineNr">107 </span>    <a href='003trace.cc.html#L189'>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 transform: '&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#L213'>end</a><span class="Delimiter">();</span>
+<span id="L106" class="LineNr">106 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>
+<span id="L107" class="LineNr">107 </span>    <a href='003trace.cc.html#L190'>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 transform: '&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#L215'>end</a><span class="Delimiter">();</span>
 <span id="L108" class="LineNr">108 </span>  <span class="Delimiter">}</span>
 <span id="L109" class="LineNr">109 </span><span class="Delimiter">}</span>
 <span id="L110" class="LineNr">110 </span>
 <span id="L111" class="LineNr">111 </span><span class="Comment">// Assumes all bitfields are packed.</span>
-<span id="L112" class="LineNr">112 </span><span class="Normal">uint32_t</span> <a href='026labels.cc.html#L112'>num_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L112" class="LineNr">112 </span><span class="Normal">uint32_t</span> <a href='034labels.cc.html#L112'>num_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L113" class="LineNr">113 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L115" class="LineNr">115 </span>    <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L115" class="LineNr">115 </span>    <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L116" class="LineNr">116 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span> || has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span>  <span class="Comment">// only multi-byte operands</span>
 <span id="L117" class="LineNr">117 </span>      sum += <span class="Constant">4</span><span class="Delimiter">;</span>
 <span id="L118" class="LineNr">118 </span>    <span class="Normal">else</span>
@@ -182,11 +182,11 @@ if ('onhashchange' in window) {
 <span id="L121" class="LineNr">121 </span>  <span class="Identifier">return</span> sum<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>string <a href='026labels.cc.html#L124'>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="L124" class="LineNr">124 </span>string <a href='034labels.cc.html#L124'>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="L125" class="LineNr">125 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L126" class="LineNr">126 </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#L109'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L126" class="LineNr">126 </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#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L127" class="LineNr">127 </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="L128" class="LineNr">128 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L109'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L115'>data</a><span class="Delimiter">;</span>
+<span id="L128" class="LineNr">128 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L117'>data</a><span class="Delimiter">;</span>
 <span id="L129" class="LineNr">129 </span>  <span class="Delimiter">}</span>
 <span id="L130" class="LineNr">130 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L131" class="LineNr">131 </span><span class="Delimiter">}</span>
@@ -199,18 +199,18 @@ if ('onhashchange' in window) {
 <span id="L138" class="LineNr">138 </span>
 <span id="L139" class="LineNr">139 </span><span class="Delimiter">:(scenario multiple_labels_at)</span>
 <span id="L140" class="LineNr">140 </span>== <span class="Constant">0x1</span>
-<span id="L141" class="LineNr">141 </span>          <span class="Comment"># instruction                     effective address                                           operand     displacement    immediate</span>
-<span id="L142" class="LineNr">142 </span>          <span class="Comment"># op          subop               mod             rm32          base      index     scale     r32</span>
-<span id="L143" class="LineNr">143 </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="L141" class="LineNr">141 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L142" class="LineNr">142 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L143" class="LineNr">143 </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="L144" class="LineNr">144 </span><span class="Comment"># address 1</span>
 <span id="L145" class="LineNr">145 </span><span class="Normal">loop</span>:
 <span id="L146" class="LineNr">146 </span><span class="Normal">loop2</span>:
 <span id="L147" class="LineNr">147 </span><span class="Comment"># address 1 (labels take up no space)</span>
-<span id="L148" class="LineNr">148 </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="L148" class="LineNr">148 </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="L149" class="LineNr">149 </span><span class="Comment"># address 6</span>
-<span id="L150" class="LineNr">150 </span>            eb                                                                                                      loop2/disp8
+<span id="L150" class="LineNr">150 </span>            eb                                                                                                              loop2/disp8
 <span id="L151" class="LineNr">151 </span><span class="Comment"># address 8</span>
-<span id="L152" class="LineNr">152 </span>            eb                                                                                                      loop3/disp8
+<span id="L152" class="LineNr">152 </span>            eb                                                                                                              loop3/disp8
 <span id="L153" class="LineNr">153 </span><span class="Comment"># address 10</span>
 <span id="L154" class="LineNr">154 </span><span class="Normal">loop3</span>:
 <span id="L155" class="LineNr">155 </span><span class="traceContains">+transform: <a href='003trace.cc.html#L73'>label</a> 'loop' is at address 1</span>
diff --git a/html/subx/035label_types.cc.html b/html/subx/035label_types.cc.html
new file mode 100644
index 00000000..1c980ac8
--- /dev/null
+++ b/html/subx/035label_types.cc.html
@@ -0,0 +1,67 @@
+<!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/035label_types.cc</title>
+<meta name="Generator" content="Vim/7.4">
+<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; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.LineNr { color: #444444; }
+-->
+</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">//: Distinguish between labels marking the start of a function, and labels</span>
+<span id="L2" class="LineNr">2 </span><span class="Comment">//: inside functions.</span>
+<span id="L3" class="LineNr">3 </span><span class="Comment">//:</span>
+<span id="L4" class="LineNr">4 </span><span class="Comment">//:   Labels within functions start with a '$', and are only permitted in</span>
+<span id="L5" class="LineNr">5 </span><span class="Comment">//:   'jump' instructions.</span>
+<span id="L6" class="LineNr">6 </span><span class="Comment">//:</span>
+<span id="L7" class="LineNr">7 </span><span class="Comment">//:   Labels marking the start of functions lack the '$' sigil, and are only</span>
+<span id="L8" class="LineNr">8 </span><span class="Comment">//:   permitted in 'call' instructions.</span>
+<span id="L9" class="LineNr">9 </span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/ex1.1.subx.html b/html/subx/ex1.1.subx.html
new file mode 100644
index 00000000..1a4c154d
--- /dev/null
+++ b/html/subx/ex1.1.subx.html
@@ -0,0 +1,79 @@
+<!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/ex1.1.subx</title>
+<meta name="Generator" content="Vim/7.4">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<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; }
+.SalientComment { color: #00ffff; }
+.LineNr { color: #444444; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## first program: same as <a href="https://www.muppetlabs.com/~breadbox/software/tiny/teensy.html">https://www.muppetlabs.com/~breadbox/software/tiny/teensy.html</a></span>
+<span id="L2" class="LineNr"> 2 </span><span class="Comment"># Just return 42.</span>
+<span id="L3" class="LineNr"> 3 </span><span class="Comment">#</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Comment"># To run:</span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx translate ex1.1.subx ex1</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Comment">#   $ subx run ex1</span>
+<span id="L7" class="LineNr"> 7 </span><span class="Comment"># Expected result:</span>
+<span id="L8" class="LineNr"> 8 </span><span class="Comment">#   $ echo $?</span>
+<span id="L9" class="LineNr"> 9 </span><span class="Comment">#   42</span>
+<span id="L10" class="LineNr">10 </span>
+<span id="L11" class="LineNr">11 </span>== 0x08048054  <span class="Comment"># code segment, after leaving room for ELF header</span>
+<span id="L12" class="LineNr">12 </span><span class="Comment"># opcode        ModR/M                    SIB                   displacement    immediate</span>
+<span id="L13" class="LineNr">13 </span><span class="Comment"># instruction   mod, reg, Reg/Mem bits    scale, index, base</span>
+<span id="L14" class="LineNr">14 </span><span class="Comment"># 1-3 bytes     0/1 byte                  0/1 byte              0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L15" class="LineNr">15 </span>  bb                                                                            2a 00 00 00       <span class="Comment"># copy 0x2a (42) to EBX</span>
+<span id="L16" class="LineNr">16 </span>  <span class="Comment"># exit(EBX)</span>
+<span id="L17" class="LineNr">17 </span>  b8                                                                            01 00 00 00       <span class="Comment"># copy 1 to EAX</span>
+<span id="L18" class="LineNr">18 </span>  cd                                                                            80                <span class="Comment"># int 80h</span>
+<span id="L19" class="LineNr">19 </span>
+<span id="L20" class="LineNr">20 </span><span class="Comment"># vim&#0058;ft=subx</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/ex1.2.subx.html b/html/subx/ex1.2.subx.html
new file mode 100644
index 00000000..61400270
--- /dev/null
+++ b/html/subx/ex1.2.subx.html
@@ -0,0 +1,79 @@
+<!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/ex1.2.subx</title>
+<meta name="Generator" content="Vim/7.4">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<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; }
+.SalientComment { color: #00ffff; }
+.LineNr { color: #444444; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## first program: same as <a href="https://www.muppetlabs.com/~breadbox/software/tiny/teensy.html">https://www.muppetlabs.com/~breadbox/software/tiny/teensy.html</a></span>
+<span id="L2" class="LineNr"> 2 </span><span class="Comment"># Just return 42.</span>
+<span id="L3" class="LineNr"> 3 </span><span class="Comment">#</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Comment"># To run:</span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx translate ex1.2.subx ex1</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Comment">#   $ subx run ex1</span>
+<span id="L7" class="LineNr"> 7 </span><span class="Comment"># Expected result:</span>
+<span id="L8" class="LineNr"> 8 </span><span class="Comment">#   $ echo $?</span>
+<span id="L9" class="LineNr"> 9 </span><span class="Comment">#   42</span>
+<span id="L10" class="LineNr">10 </span>
+<span id="L11" class="LineNr">11 </span>== 0x08048054  <span class="Comment"># code segment, after leaving room for ELF header</span>
+<span id="L12" class="LineNr">12 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L13" class="LineNr">13 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L14" class="LineNr">14 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L15" class="LineNr">15 </span>  bb/copy                                                                                                                         2a/imm32          <span class="Comment"># copy 42 to EBX</span>
+<span id="L16" class="LineNr">16 </span>  <span class="Comment"># exit(EBX)</span>
+<span id="L17" class="LineNr">17 </span>  b8/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EAX</span>
+<span id="L18" class="LineNr">18 </span>  cd/syscall                                                                                                                      0x80/imm8         <span class="Comment"># int 80h</span>
+<span id="L19" class="LineNr">19 </span>
+<span id="L20" class="LineNr">20 </span><span class="Comment"># vim&#0058;ft=subx</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/ex2.subx.html b/html/subx/ex2.subx.html
new file mode 100644
index 00000000..b0b0e50f
--- /dev/null
+++ b/html/subx/ex2.subx.html
@@ -0,0 +1,79 @@
+<!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/ex2.subx</title>
+<meta name="Generator" content="Vim/7.4">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<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; }
+.SalientComment { color: #00ffff; }
+.LineNr { color: #444444; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## add 1 and 1, and return the result in the exit code</span>
+<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
+<span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run:</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate ex2.subx ex2</span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run ex2</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Comment"># Expected result:</span>
+<span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ echo $?</span>
+<span id="L8" class="LineNr"> 8 </span><span class="Comment">#   2</span>
+<span id="L9" class="LineNr"> 9 </span>
+<span id="L10" class="LineNr">10 </span>== 0x08048054  <span class="Comment"># code segment, after leaving room for ELF header</span>
+<span id="L11" class="LineNr">11 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L12" class="LineNr">12 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L13" class="LineNr">13 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L14" class="LineNr">14 </span>  bb/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EBX</span>
+<span id="L15" class="LineNr">15 </span>  81          0/subop/add         3/mod/direct    3/rm32/ebx                                                                      1/imm32           <span class="Comment"># add 1 to EBX</span>
+<span id="L16" class="LineNr">16 </span>  <span class="Comment"># exit(EBX)</span>
+<span id="L17" class="LineNr">17 </span>  b8/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EAX</span>
+<span id="L18" class="LineNr">18 </span>  cd/syscall                                                                                                                      0x80/imm8         <span class="Comment"># int 80h</span>
+<span id="L19" class="LineNr">19 </span>
+<span id="L20" class="LineNr">20 </span><span class="Comment"># vim&#0058;ft=subx</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/ex3.subx.html b/html/subx/ex3.subx.html
new file mode 100644
index 00000000..c3dddcfb
--- /dev/null
+++ b/html/subx/ex3.subx.html
@@ -0,0 +1,94 @@
+<!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/ex3.subx</title>
+<meta name="Generator" content="Vim/7.4">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<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; }
+.SalientComment { color: #00ffff; }
+.LineNr { color: #444444; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## add the first 10 numbers, and return the result in the exit code</span>
+<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
+<span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run:</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate ex3.subx ex3</span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run ex3</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Comment"># Expected result:</span>
+<span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ echo $?</span>
+<span id="L8" class="LineNr"> 8 </span><span class="Comment">#   55</span>
+<span id="L9" class="LineNr"> 9 </span>
+<span id="L10" class="LineNr">10 </span>== 0x08048054  <span class="Comment"># code segment, after leaving room for ELF header</span>
+<span id="L11" class="LineNr">11 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L12" class="LineNr">12 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L13" class="LineNr">13 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L14" class="LineNr">14 </span>  <span class="Comment"># result: EBX = 0</span>
+<span id="L15" class="LineNr">15 </span>  bb/copy                                                                                                                         0/imm32           <span class="Comment"># copy 0 to EBX</span>
+<span id="L16" class="LineNr">16 </span>  <span class="Comment"># counter: ECX = 1</span>
+<span id="L17" class="LineNr">17 </span>  b9/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to ECX</span>
+<span id="L18" class="LineNr">18 </span>
+<span id="L19" class="LineNr">19 </span>loop:
+<span id="L20" class="LineNr">20 </span>  <span class="Comment"># while (counter &lt;= 10)</span>
+<span id="L21" class="LineNr">21 </span>  81          7/subop/compare     3/mod/direct    1/rm32/ecx                                                                      0xa/imm32         <span class="Comment"># compare ECX, 10/imm</span>
+<span id="L22" class="LineNr">22 </span>  7f/jump-if                                                                                                      exit/disp8                        <span class="Comment"># jump-if-greater exit</span>
+<span id="L23" class="LineNr">23 </span>  <span class="Comment"># result += counter</span>
+<span id="L24" class="LineNr">24 </span>  01/add                          3/mod/direct    3/rm32/ebx                                          1/r32/ecx                                     <span class="Comment"># add ECX to EBX</span>
+<span id="L25" class="LineNr">25 </span>  <span class="Comment"># ++counter</span>
+<span id="L26" class="LineNr">26 </span>  81          0/subop/add         3/mod/direct    1/rm32/ecx                                                                      1/imm32           <span class="Comment"># add 1 to ECX</span>
+<span id="L27" class="LineNr">27 </span>  <span class="Comment"># loop</span>
+<span id="L28" class="LineNr">28 </span>  eb/jump                                                                                                         loop/disp8                        <span class="Comment"># jump loop</span>
+<span id="L29" class="LineNr">29 </span>
+<span id="L30" class="LineNr">30 </span>exit:
+<span id="L31" class="LineNr">31 </span>  <span class="Comment"># exit(EBX)</span>
+<span id="L32" class="LineNr">32 </span>  b8/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EAX</span>
+<span id="L33" class="LineNr">33 </span>  cd/syscall                                                                                                                      0x80/imm8         <span class="Comment"># int 80h</span>
+<span id="L34" class="LineNr">34 </span>
+<span id="L35" class="LineNr">35 </span><span class="Comment"># vim&#0058;ft=subx:nowrap</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/ex4.subx.html b/html/subx/ex4.subx.html
new file mode 100644
index 00000000..609fca41
--- /dev/null
+++ b/html/subx/ex4.subx.html
@@ -0,0 +1,100 @@
+<!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/ex4.subx</title>
+<meta name="Generator" content="Vim/7.4">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<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; }
+.SalientComment { color: #00ffff; }
+.LineNr { color: #444444; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## read a character from stdin, save it to a global, write it to stdout</span>
+<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
+<span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run:</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate ex4.subx ex4</span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run ex4</span>
+<span id="L6" class="LineNr"> 6 </span>
+<span id="L7" class="LineNr"> 7 </span>== 0x08048074  <span class="Comment"># code segment, after leaving room for ELF header and segment headers</span>
+<span id="L8" class="LineNr"> 8 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L9" class="LineNr"> 9 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L10" class="LineNr">10 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L11" class="LineNr">11 </span>
+<span id="L12" class="LineNr">12 </span>  <span class="SalientComment">## read(stdin, x, 1)</span>
+<span id="L13" class="LineNr">13 </span>  <span class="Comment"># fd = 0 (stdin)</span>
+<span id="L14" class="LineNr">14 </span>  bb/copy                                                                                                                         0/imm32           <span class="Comment"># copy 0 to EBX</span>
+<span id="L15" class="LineNr">15 </span>  <span class="Comment"># initialize x (location to write result to)</span>
+<span id="L16" class="LineNr">16 </span>  b9/copy                                                                                                                         0x080490a7/imm32  <span class="Comment"># copy to ECX</span>
+<span id="L17" class="LineNr">17 </span>  <span class="Comment"># size = 1 character</span>
+<span id="L18" class="LineNr">18 </span>  ba/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EDX</span>
+<span id="L19" class="LineNr">19 </span>  <span class="Comment"># read(fd, x, size)</span>
+<span id="L20" class="LineNr">20 </span>  b8/copy                                                                                                                         3/imm32           <span class="Comment"># copy 3 to EAX</span>
+<span id="L21" class="LineNr">21 </span>  cd/syscall                                                                                                                      0x80/imm8         <span class="Comment"># int 80h</span>
+<span id="L22" class="LineNr">22 </span>
+<span id="L23" class="LineNr">23 </span>  <span class="SalientComment">## write(stdout, x, 1)</span>
+<span id="L24" class="LineNr">24 </span>  <span class="Comment"># fd = 1 (stdout)</span>
+<span id="L25" class="LineNr">25 </span>  bb/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EBX</span>
+<span id="L26" class="LineNr">26 </span>  <span class="Comment"># initialize x (location to read from)</span>
+<span id="L27" class="LineNr">27 </span>  b9/copy                                                                                                                         0x080490a7/imm32  <span class="Comment"># copy to ECX</span>
+<span id="L28" class="LineNr">28 </span>  <span class="Comment"># size = 1 character</span>
+<span id="L29" class="LineNr">29 </span>  ba/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EDX</span>
+<span id="L30" class="LineNr">30 </span>  <span class="Comment"># write(fd, x, size)</span>
+<span id="L31" class="LineNr">31 </span>  b8/copy                                                                                                                         4/imm32           <span class="Comment"># copy 4 to EAX</span>
+<span id="L32" class="LineNr">32 </span>  cd/syscall                                                                                                                      0x80/imm8         <span class="Comment"># int 80h</span>
+<span id="L33" class="LineNr">33 </span>
+<span id="L34" class="LineNr">34 </span>  <span class="SalientComment">## exit(EBX)</span>
+<span id="L35" class="LineNr">35 </span>  b8/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EAX</span>
+<span id="L36" class="LineNr">36 </span>  cd/syscall                                                                                                                      0x80/imm8         <span class="Comment"># int 80h</span>
+<span id="L37" class="LineNr">37 </span>
+<span id="L38" class="LineNr">38 </span>== 0x080490a7
+<span id="L39" class="LineNr">39 </span>00 00 00 00  <span class="Comment"># space for read() to write to</span>
+<span id="L40" class="LineNr">40 </span>
+<span id="L41" class="LineNr">41 </span><span class="Comment"># vim&#0058;ft=subx:nowrap</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/ex5.subx.html b/html/subx/ex5.subx.html
new file mode 100644
index 00000000..297f0ab2
--- /dev/null
+++ b/html/subx/ex5.subx.html
@@ -0,0 +1,104 @@
+<!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/ex5.subx</title>
+<meta name="Generator" content="Vim/7.4">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<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; }
+.SalientComment { color: #00ffff; }
+.LineNr { color: #444444; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## read a character from stdin, save it to a local on the stack, write it to stdout</span>
+<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
+<span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run:</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate ex5.subx ex5</span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run ex5</span>
+<span id="L6" class="LineNr"> 6 </span>
+<span id="L7" class="LineNr"> 7 </span>== 0x08048054  <span class="Comment"># code segment, after leaving room for ELF header and segment headers</span>
+<span id="L8" class="LineNr"> 8 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L9" class="LineNr"> 9 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L10" class="LineNr">10 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L11" class="LineNr">11 </span>
+<span id="L12" class="LineNr">12 </span><span class="SalientComment">## function 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="SalientComment">## 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           <span class="Comment"># copy 3 to EAX</span>
+<span id="L28" class="LineNr">28 </span>  cd/syscall                                                                                                                      0x80/imm8         <span class="Comment"># int 80h</span>
+<span id="L29" class="LineNr">29 </span>
+<span id="L30" class="LineNr">30 </span>  <span class="SalientComment">## 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           <span class="Comment"># copy 4 to EAX</span>
+<span id="L39" class="LineNr">39 </span>  cd/syscall                                                                                                                      0x80/imm8         <span class="Comment"># int 80h</span>
+<span id="L40" class="LineNr">40 </span>
+<span id="L41" class="LineNr">41 </span>  <span class="SalientComment">## exit(EBX)</span>
+<span id="L42" class="LineNr">42 </span>  b8/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EAX</span>
+<span id="L43" class="LineNr">43 </span>  cd/syscall                                                                                                                      0x80/imm8         <span class="Comment"># int 80h</span>
+<span id="L44" class="LineNr">44 </span>
+<span id="L45" class="LineNr">45 </span><span class="Comment"># vim&#0058;ft=subx:nowrap</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/ex6.subx.html b/html/subx/ex6.subx.html
new file mode 100644
index 00000000..f79324f6
--- /dev/null
+++ b/html/subx/ex6.subx.html
@@ -0,0 +1,95 @@
+<!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/ex6.subx</title>
+<meta name="Generator" content="Vim/7.4">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<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; }
+.SalientComment { color: #00ffff; }
+.LineNr { color: #444444; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## print out a (global variable) string to stdout</span>
+<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
+<span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run:</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate ex6.subx ex6</span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run ex6</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Comment">#   Hello, world!</span>
+<span id="L7" class="LineNr"> 7 </span>
+<span id="L8" class="LineNr"> 8 </span>== 0x08048074  <span class="Comment"># code segment, after leaving room for ELF header and segment headers</span>
+<span id="L9" class="LineNr"> 9 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L10" class="LineNr">10 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L11" class="LineNr">11 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L12" class="LineNr">12 </span>
+<span id="L13" class="LineNr">13 </span>  <span class="SalientComment">## write(stdout, x, 1)</span>
+<span id="L14" class="LineNr">14 </span>  <span class="Comment"># fd = 1 (stdout)</span>
+<span id="L15" class="LineNr">15 </span>  bb/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EBX</span>
+<span id="L16" class="LineNr">16 </span>  <span class="Comment"># initialize x (location to write result to)</span>
+<span id="L17" class="LineNr">17 </span>  b9/copy                                                                                                                         0x08049097/imm32  <span class="Comment"># copy to ECX</span>
+<span id="L18" class="LineNr">18 </span>  <span class="Comment"># initialize size</span>
+<span id="L19" class="LineNr">19 </span>  ba/copy                                                                                                                         0x08049093/imm32  <span class="Comment"># copy to EDX</span>
+<span id="L20" class="LineNr">20 </span>  8b/copy                         0/mod/indirect  2/rm32/edx                                          2/r32/edx                                     <span class="Comment"># copy *EDX to EDX</span>
+<span id="L21" class="LineNr">21 </span>  <span class="Comment"># write(fd, x, size)</span>
+<span id="L22" class="LineNr">22 </span>  b8/copy                                                                                                                         4/imm32           <span class="Comment"># copy 4 to EAX</span>
+<span id="L23" class="LineNr">23 </span>  cd/syscall                                                                                                                      0x80/imm8         <span class="Comment"># int 80h</span>
+<span id="L24" class="LineNr">24 </span>
+<span id="L25" class="LineNr">25 </span>  <span class="SalientComment">## exit(EBX)</span>
+<span id="L26" class="LineNr">26 </span>  b8/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EAX</span>
+<span id="L27" class="LineNr">27 </span>  cd/syscall                                                                                                                      0x80/imm8         <span class="Comment"># int 80h</span>
+<span id="L28" class="LineNr">28 </span>
+<span id="L29" class="LineNr">29 </span>== 0x08049093
+<span id="L30" class="LineNr">30 </span><span class="Comment"># size of string</span>
+<span id="L31" class="LineNr">31 </span>0e 00 00 00
+<span id="L32" class="LineNr">32 </span><span class="Comment"># string</span>
+<span id="L33" class="LineNr">33 </span>  48 65 6c 6c 6f 2c 20 77 6f 72 6c 64 21 0a
+<span id="L34" class="LineNr">34 </span><span class="Comment"># h  e  l  l  o  ,  ␣  w  o  r  l  d  !  newline</span>
+<span id="L35" class="LineNr">35 </span>
+<span id="L36" class="LineNr">36 </span><span class="Comment"># vim&#0058;ft=subx:nowrap</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/ex7.subx.html b/html/subx/ex7.subx.html
new file mode 100644
index 00000000..33e56e2a
--- /dev/null
+++ b/html/subx/ex7.subx.html
@@ -0,0 +1,124 @@
+<!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/ex7.subx</title>
+<meta name="Generator" content="Vim/7.4">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<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; }
+.SalientComment { color: #00ffff; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## compute the factorial of 5, and return the result in the exit code</span>
+<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
+<span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run:</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate ex7.subx ex7</span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run ex7</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Comment"># Expected result:</span>
+<span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ echo $?</span>
+<span id="L8" class="LineNr"> 8 </span><span class="Comment">#   120</span>
+<span id="L9" class="LineNr"> 9 </span>
+<span id="L10" class="LineNr">10 </span>== 0x08048054  <span class="Comment"># code segment, after leaving room for ELF header</span>
+<span id="L11" class="LineNr">11 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L12" class="LineNr">12 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L13" class="LineNr">13 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L14" class="LineNr">14 </span>
+<span id="L15" class="LineNr">15 </span><span class="Comment"># main:</span>
+<span id="L16" class="LineNr">16 </span>  <span class="Comment"># prepare to make a call</span>
+<span id="L17" class="LineNr">17 </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="L18" class="LineNr">18 </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="L19" class="LineNr">19 </span>  <span class="Comment"># factorial(5)</span>
+<span id="L20" class="LineNr">20 </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="L21" class="LineNr">21 </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="L22" class="LineNr">22 </span>  <span class="Comment"># discard arg</span>
+<span id="L23" class="LineNr">23 </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="L24" class="LineNr">24 </span>  <span class="Comment"># clean up after call</span>
+<span id="L25" class="LineNr">25 </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="L26" class="LineNr">26 </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="L27" class="LineNr">27 </span>
+<span id="L28" class="LineNr">28 </span>  <span class="Comment"># exit(EAX)</span>
+<span id="L29" class="LineNr">29 </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="L30" class="LineNr">30 </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="L31" class="LineNr">31 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8         <span class="Comment"># int 80h</span>
+<span id="L32" class="LineNr">32 </span>
+<span id="L33" class="LineNr">33 </span><span class="Comment"># factorial(n)</span>
+<span id="L34" class="LineNr">34 </span>factorial:
+<span id="L35" class="LineNr">35 </span>  <span class="Comment"># initialize n</span>
+<span id="L36" class="LineNr">36 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              2/r32/EDX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EDX</span>
+<span id="L37" class="LineNr">37 </span>  <span class="Comment"># initialize EAX to 1 (base case)</span>
+<span id="L38" class="LineNr">38 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EAX</span>
+<span id="L39" class="LineNr">39 </span>  <span class="Comment"># if (n &lt;= 1) jump exit</span>
+<span id="L40" class="LineNr">40 </span>  81          7/subop/compare     3/mod/direct    2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># compare EDX with 1</span>
+<span id="L41" class="LineNr">41 </span>  7e/jump-if                     <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 exit</span>
+<span id="L42" class="LineNr">42 </span>  <span class="Comment"># EBX: n-1</span>
+<span id="L43" class="LineNr">43 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EDX to EBX</span>
+<span id="L44" class="LineNr">44 </span>  81          5/subop/subtract    3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># subtract 1 from EBX</span>
+<span id="L45" class="LineNr">45 </span>  <span class="Comment"># prepare call</span>
+<span id="L46" class="LineNr">46 </span>  55/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EBP</span>
+<span id="L47" class="LineNr">47 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
+<span id="L48" class="LineNr">48 </span>  <span class="Comment"># EAX: factorial(n-1)</span>
+<span id="L49" class="LineNr">49 </span>  53/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EBX</span>
+<span id="L50" class="LineNr">50 </span>  e8/call                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          factorial/disp32
+<span id="L51" class="LineNr">51 </span>  <span class="Comment"># discard arg</span>
+<span id="L52" class="LineNr">52 </span>  5e/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># pop into ESI</span>
+<span id="L53" class="LineNr">53 </span>  <span class="Comment"># clean up after call</span>
+<span id="L54" class="LineNr">54 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L55" class="LineNr">55 </span>  5d/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># pop to EBP</span>
+<span id="L56" class="LineNr">56 </span>  <span class="Comment"># refresh n</span>
+<span id="L57" class="LineNr">57 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              2/r32/EDX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EDX</span>
+<span id="L58" class="LineNr">58 </span>  <span class="Comment"># return n * factorial(n-1)</span>
+<span id="L59" class="LineNr">59 </span>  0f af/multiply                  3/mod/direct    2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># multiply EDX (n) into EAX (factorial(n-1))</span>
+<span id="L60" class="LineNr">60 </span>  <span class="Comment"># TODO: check for overflow</span>
+<span id="L61" class="LineNr">61 </span>factorial:exit:
+<span id="L62" class="LineNr">62 </span>  c3/return
+<span id="L63" class="LineNr">63 </span>
+<span id="L64" class="LineNr">64 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:so=0</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/x.subx.html b/html/subx/x.subx.html
new file mode 100644
index 00000000..373298c2
--- /dev/null
+++ b/html/subx/x.subx.html
@@ -0,0 +1,124 @@
+<!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/x.subx</title>
+<meta name="Generator" content="Vim/7.4">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<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; }
+.SalientComment { color: #00ffff; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## compute the factorial of 5, and return the result in the exit code</span>
+<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
+<span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run:</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate ex7.subx ex7</span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run ex7</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Comment"># Expected result:</span>
+<span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ echo $?</span>
+<span id="L8" class="LineNr"> 8 </span><span class="Comment">#   120</span>
+<span id="L9" class="LineNr"> 9 </span>
+<span id="L10" class="LineNr">10 </span>== 0x08048054  <span class="Comment"># code segment, after leaving room for ELF header</span>
+<span id="L11" class="LineNr">11 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L12" class="LineNr">12 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L13" class="LineNr">13 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L14" class="LineNr">14 </span>
+<span id="L15" class="LineNr">15 </span><span class="Comment"># main:</span>
+<span id="L16" class="LineNr">16 </span>  <span class="Comment"># prepare to make a call</span>
+<span id="L17" class="LineNr">17 </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="L18" class="LineNr">18 </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="L19" class="LineNr">19 </span>  <span class="Comment"># factorial(5)</span>
+<span id="L20" class="LineNr">20 </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="L21" class="LineNr">21 </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="L22" class="LineNr">22 </span>  <span class="Comment"># discard arg</span>
+<span id="L23" class="LineNr">23 </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="L24" class="LineNr">24 </span>  <span class="Comment"># clean up after call</span>
+<span id="L25" class="LineNr">25 </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="L26" class="LineNr">26 </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="L27" class="LineNr">27 </span>
+<span id="L28" class="LineNr">28 </span>  <span class="Comment"># exit(EAX)</span>
+<span id="L29" class="LineNr">29 </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="L30" class="LineNr">30 </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="L31" class="LineNr">31 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8         <span class="Comment"># int 80h</span>
+<span id="L32" class="LineNr">32 </span>
+<span id="L33" class="LineNr">33 </span><span class="Comment"># factorial(n)</span>
+<span id="L34" class="LineNr">34 </span>factorial:
+<span id="L35" class="LineNr">35 </span>  <span class="Comment"># initialize n</span>
+<span id="L36" class="LineNr">36 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              2/r32/EDX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EDX</span>
+<span id="L37" class="LineNr">37 </span>  <span class="Comment"># initialize EAX to 1 (base case)</span>
+<span id="L38" class="LineNr">38 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EAX</span>
+<span id="L39" class="LineNr">39 </span>  <span class="Comment"># if (n &lt;= 1) jump exit</span>
+<span id="L40" class="LineNr">40 </span>  81          7/subop/compare     3/mod/direct    2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># compare EDX with 1</span>
+<span id="L41" class="LineNr">41 </span>  7e/jump-if                     <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 exit</span>
+<span id="L42" class="LineNr">42 </span>  <span class="Comment"># EBX: n-1</span>
+<span id="L43" class="LineNr">43 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EDX to EBX</span>
+<span id="L44" class="LineNr">44 </span>  81          5/subop/subtract    3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># subtract 1 from EBX</span>
+<span id="L45" class="LineNr">45 </span>  <span class="Comment"># prepare call</span>
+<span id="L46" class="LineNr">46 </span>  55/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EBP</span>
+<span id="L47" class="LineNr">47 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
+<span id="L48" class="LineNr">48 </span>  <span class="Comment"># EAX: factorial(n-1)</span>
+<span id="L49" class="LineNr">49 </span>  53/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EBX</span>
+<span id="L50" class="LineNr">50 </span>  e8/call                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          factorial/disp32
+<span id="L51" class="LineNr">51 </span>  <span class="Comment"># discard arg</span>
+<span id="L52" class="LineNr">52 </span>  5e/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># pop into ESI</span>
+<span id="L53" class="LineNr">53 </span>  <span class="Comment"># clean up after call</span>
+<span id="L54" class="LineNr">54 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L55" class="LineNr">55 </span>  5d/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># pop to EBP</span>
+<span id="L56" class="LineNr">56 </span>  <span class="Comment"># refresh n</span>
+<span id="L57" class="LineNr">57 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              2/r32/EDX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EDX</span>
+<span id="L58" class="LineNr">58 </span>  <span class="Comment"># return n * factorial(n-1)</span>
+<span id="L59" class="LineNr">59 </span>  0f af/multiply                  3/mod/direct    2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># multiply EDX (n) into EAX (factorial(n-1))</span>
+<span id="L60" class="LineNr">60 </span>  <span class="Comment"># TODO: check for overflow</span>
+<span id="L61" class="LineNr">61 </span>factorial:exit:
+<span id="L62" class="LineNr">62 </span>  c3/return
+<span id="L63" class="LineNr">63 </span>
+<span id="L64" class="LineNr">64 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:so=0</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/update_html b/update_html
index d525ee8d..6f45ae4e 100755
--- a/update_html
+++ b/update_html
@@ -75,7 +75,7 @@ done
 ( cd subx
   ctags -x *.cc  |grep -v '^. '  > /tmp/tags  # don't hyperlink every 'i' to the integer register variant
 )
-for f in subx/*.cc
+for f in subx/*.cc subx/*.subx
 do
   process $f
 done
author	Kartik Agaram <vc@akkartik.com>	2018-08-04 17:00:27 -0700
committer	Kartik Agaram <vc@akkartik.com>	2018-08-04 17:00:27 -0700
commit	bb2b6ba7fd72bbebc3a4490d090f080e7b8628cc (patch)
tree	2a8e0697887f3028b3b9042b62fa57064537bd87
parent	6cabcefe67d2cd0583b556129fe3d8c89cf0fcb8 (diff)
download	mu-bb2b6ba7fd72bbebc3a4490d090f080e7b8628cc.tar.gz