about summary refs log tree commit diff stats
path: root/html/subx
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2018-01-25 22:39:31 -0800
committerKartik K. Agaram <vc@akkartik.com>2018-01-25 22:39:31 -0800
commit805d58c6aeeeba3e4989c0eed6781b3861e8fae0 (patch)
treeea5225bdd7c5fbeea912671cdc5f1c4b2b2828d7 /html/subx
parentaefa8fec6a473be459a2ff33e6bd96e7c22ced20 (diff)
downloadmu-805d58c6aeeeba3e4989c0eed6781b3861e8fae0.tar.gz
4199
Diffstat (limited to 'html/subx')
-rw-r--r--html/subx/000organization.cc.html13
-rw-r--r--html/subx/001help.cc.html41
-rw-r--r--html/subx/002test.cc.html43
-rw-r--r--html/subx/003trace.cc.html129
-rw-r--r--html/subx/003trace.test.cc.html4
-rw-r--r--html/subx/010core.cc.html179
-rw-r--r--html/subx/011direct_addressing.cc.html598
-rw-r--r--html/subx/012indirect_addressing.cc.html853
-rw-r--r--html/subx/013immediate_addressing.cc.html790
-rw-r--r--html/subx/014index_addressing.cc.html181
-rw-r--r--html/subx/014jump_relative.cc.html320
-rw-r--r--html/subx/015jump_relative.cc.html495
-rw-r--r--html/subx/016jump_relative.cc.html325
-rw-r--r--html/subx/017functions.cc.html (renamed from html/subx/016functions.cc.html)48
-rw-r--r--html/subx/020elf.cc.html138
15 files changed, 2328 insertions, 1829 deletions
diff --git a/html/subx/000organization.cc.html b/html/subx/000organization.cc.html
index 4e1190cd..411fb7a4 100644
--- a/html/subx/000organization.cc.html
+++ b/html/subx/000organization.cc.html
@@ -15,16 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Conceal { color: #4e4e4e; }
-.PreProc { color: #800080; }
+.cSpecial { color: #008000; }
 .LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
 .Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.cSpecial { color: #008000; }
+.PreProc { color: #800080; }
 -->
 </style>
 
@@ -205,8 +204,8 @@ if ('onhashchange' in window) {
 <span id="L144" class="LineNr">144 </span>  <span class="Normal">const</span> <span class="Normal">int</span> x = <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L145" class="LineNr">145 </span>  <span class="Normal">const</span> <span class="Normal">char</span>* y = <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 id="L146" class="LineNr">146 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>*y != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L147" class="LineNr">147 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;the SubX VM only runs on little-endian processors. Do you have Intel (or AMD or Atom) inside?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L147" class="LineNr">147 </span>    cerr &lt;&lt; <span class="Constant">&quot;the SubX VM only runs on little-endian processors. Do you have Intel (or AMD or Atom) inside?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L148" class="LineNr">148 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L149" class="LineNr">149 </span>  <span class="Delimiter">}</span>
 <span id="L150" class="LineNr">150 </span><span class="Delimiter">}</span>
 <span id="L151" class="LineNr">151 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
diff --git a/html/subx/001help.cc.html b/html/subx/001help.cc.html
index a96cc59d..b41814f3 100644
--- a/html/subx/001help.cc.html
+++ b/html/subx/001help.cc.html
@@ -15,18 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
+.CommentedCode { color: #6c6c6c; }
 .PreProc { color: #800080; }
 .LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
 .SalientComment { color: #00ffff; }
 .Identifier { color: #c0a020; }
-.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.Conceal { color: #4e4e4e; }
-.CommentedCode { color: #6c6c6c; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
@@ -69,7 +68,7 @@ if ('onhashchange' in window) {
 <span id="L6" class="LineNr">  6 </span>  <span class="Comment">//: this is the functionality later layers will provide</span>
 <span id="L7" class="LineNr">  7 </span>  <span class="Comment">// currently no automated tests for commandline arg parsing</span>
 <span id="L8" class="LineNr">  8 </span>  cerr &lt;&lt; <span class="Constant">&quot;Usage:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L9" class="LineNr">  9 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span>&lt;&lt; <span class="Constant">&quot;  subx test</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L9" class="LineNr">  9 </span>       &lt;&lt; <span class="Constant">&quot;  subx test</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L10" class="LineNr"> 10 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L11" class="LineNr"> 11 </span><span class="Delimiter">}</span>
 <span id="L12" class="LineNr"> 12 </span>
@@ -90,7 +89,7 @@ if ('onhashchange' in window) {
 <span id="L27" class="LineNr"> 27 </span><span class="Normal">bool</span> <a href='001help.cc.html#L27'>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="L28" class="LineNr"> 28 </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="L29" class="LineNr"> 29 </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#L184'>end</a><span class="Delimiter">()</span> &amp;&amp; b!=pat<span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>  ++a<span class="Delimiter">,</span> ++b<span class="Delimiter">)</span>
-<span id="L30" class="LineNr"> 30 </span>  <span class="Conceal">¦</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="L30" class="LineNr"> 30 </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="L31" class="LineNr"> 31 </span>  <span class="Identifier">return</span> b == pat<span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L32" class="LineNr"> 32 </span><span class="Delimiter">}</span>
 <span id="L33" class="LineNr"> 33 </span>
@@ -172,20 +171,20 @@ if ('onhashchange' in window) {
 <span id="L109" class="LineNr">109 </span><span class="Delimiter">}</span>
 <span id="L110" class="LineNr">110 </span><span class="Normal">void</span> <a href='001help.cc.html#L110'>dump_and_exit</a><span class="Delimiter">(</span><span class="Normal">int</span> sig<span class="Delimiter">,</span> <a href='001help.cc.html#L208'>unused</a> siginfo_t* dummy1<span class="Delimiter">,</span> <a href='001help.cc.html#L208'>unused</a> <span class="Normal">void</span>* dummy2<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L111" class="LineNr">111 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>sig<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L112" class="LineNr">112 </span>  <span class="Conceal">¦</span> <span class="Normal">case</span> <span class="Constant">SIGABRT</span>:
-<span id="L113" class="LineNr">113 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> #ifndef __APPLE__
-<span id="L114" class="LineNr">114 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;SIGABRT: might be an integer overflow if it wasn't an assert() failure</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L115" class="LineNr">115 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L116" class="LineNr">116 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> #endif
-<span id="L117" class="LineNr">117 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L118" class="LineNr">118 </span>  <span class="Conceal">¦</span> <span class="Normal">case</span> <span class="Constant">SIGILL</span>:
-<span id="L119" class="LineNr">119 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> #ifdef __APPLE__
-<span id="L120" class="LineNr">120 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;SIGILL: most likely caused by integer overflow</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L121" class="LineNr">121 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> #endif
-<span id="L123" class="LineNr">123 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L124" class="LineNr">124 </span>  <span class="Conceal">¦</span> <span class="Normal">default</span>:
-<span id="L125" class="LineNr">125 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L112" class="LineNr">112 </span>    <span class="Normal">case</span> <span class="Constant">SIGABRT</span>:
+<span id="L113" class="LineNr">113 </span>      <span class="PreProc">#ifndef __APPLE__</span>
+<span id="L114" class="LineNr">114 </span>        cerr &lt;&lt; <span class="Constant">&quot;SIGABRT: might be an integer overflow if it wasn't an assert() failure</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L115" class="LineNr">115 </span>        _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span>      <span class="PreProc">#endif</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="Normal">case</span> <span class="Constant">SIGILL</span>:
+<span id="L119" class="LineNr">119 </span>      <span class="PreProc">#ifdef __APPLE__</span>
+<span id="L120" class="LineNr">120 </span>        cerr &lt;&lt; <span class="Constant">&quot;SIGILL: most likely caused by integer overflow</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L121" class="LineNr">121 </span>        _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L122" class="LineNr">122 </span>      <span class="PreProc">#endif</span>
+<span id="L123" class="LineNr">123 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L124" class="LineNr">124 </span>    <span class="Normal">default</span>:
+<span id="L125" class="LineNr">125 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L126" class="LineNr">126 </span>  <span class="Delimiter">}</span>
 <span id="L127" class="LineNr">127 </span><span class="Delimiter">}</span>
 <span id="L128" class="LineNr">128 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
diff --git a/html/subx/002test.cc.html b/html/subx/002test.cc.html
index 75b41571..0b9a1213 100644
--- a/html/subx/002test.cc.html
+++ b/html/subx/002test.cc.html
@@ -15,17 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Conceal { color: #4e4e4e; }
-.PreProc { color: #800080; }
+.cSpecial { color: #008000; }
 .LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
 .Constant { color: #00a0a0; }
+.CommentedCode { color: #6c6c6c; }
+.Delimiter { color: #800080; }
+.Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.cSpecial { color: #008000; }
-.CommentedCode { color: #6c6c6c; }
+.PreProc { color: #800080; }
 -->
 </style>
 
@@ -85,17 +84,17 @@ if ('onhashchange' in window) {
 <span id="L23" class="LineNr">23 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
 <span id="L24" class="LineNr">24 </span><span class="PreProc">#define CHECK(X) \</span>
 <span id="L25" class="LineNr">25 </span><span class="PreProc">  </span><span class="Normal">if</span><span class="PreProc"> (Passed &amp;&amp; !(X)) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
-<span id="L26" class="LineNr">26 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> cerr &lt;&lt; </span><span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): &quot;</span><span class="PreProc"> &lt;&lt; #X &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L27" class="LineNr">27 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> <a href='002test.cc.html#L21'>Passed</a> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L28" class="LineNr">28 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L26" class="LineNr">26 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): &quot;</span><span class="PreProc"> &lt;&lt; #X &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L27" class="LineNr">27 </span><span class="PreProc">    <a href='002test.cc.html#L21'>Passed</a> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L28" class="LineNr">28 </span><span class="PreProc">    </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span><span class="PreProc"> \</span>
 <span id="L29" class="LineNr">29 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
 <span id="L30" class="LineNr">30 </span>
 <span id="L31" class="LineNr">31 </span><span class="PreProc">#define CHECK_EQ(X</span><span class="Delimiter">,</span><span class="PreProc"> Y) \</span>
 <span id="L32" class="LineNr">32 </span><span class="PreProc">  </span><span class="Normal">if</span><span class="PreProc"> (Passed &amp;&amp; (X) != (Y)) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
-<span id="L33" class="LineNr">33 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> cerr &lt;&lt; </span><span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): &quot;</span><span class="PreProc"> &lt;&lt; #X &lt;&lt; </span><span class="Constant">&quot; == &quot;</span><span class="PreProc"> &lt;&lt; #Y &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L34" class="LineNr">34 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> cerr &lt;&lt; </span><span class="Constant">&quot;  got &quot;</span><span class="PreProc"> &lt;&lt; (X) &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> BEWARE: multiple eval </span><span class="Comment">*/</span><span class="PreProc"> \</span>
-<span id="L35" class="LineNr">35 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> <a href='002test.cc.html#L21'>Passed</a> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L36" class="LineNr">36 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L33" class="LineNr">33 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): &quot;</span><span class="PreProc"> &lt;&lt; #X &lt;&lt; </span><span class="Constant">&quot; == &quot;</span><span class="PreProc"> &lt;&lt; #Y &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L34" class="LineNr">34 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;  got &quot;</span><span class="PreProc"> &lt;&lt; (X) &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> BEWARE: multiple eval </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L35" class="LineNr">35 </span><span class="PreProc">    <a href='002test.cc.html#L21'>Passed</a> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L36" class="LineNr">36 </span><span class="PreProc">    </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span><span class="PreProc"> \</span>
 <span id="L37" class="LineNr">37 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
 <span id="L38" class="LineNr">38 </span>
 <span id="L39" class="LineNr">39 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
@@ -117,17 +116,17 @@ if ('onhashchange' in window) {
 <span id="L55" class="LineNr">55 </span>  cerr &lt;&lt; <span class="Constant">&quot;C tests: &quot;</span> &lt;&lt; ctime<span class="Delimiter">(</span>&amp;t<span class="Delimiter">);</span>
 <span id="L56" class="LineNr">56 </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="Normal">sizeof</span><span class="Delimiter">(</span><a href='002test.cc.html#L15'>Tests</a><span class="Delimiter">)</span>/<span class="Normal">sizeof</span><span class="Delimiter">(</span>Tests[<span class="Constant">0</span>]<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L57" class="LineNr">57 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;running .build/test_list line &quot; &lt;&lt; (i+1) &lt;&lt; '\n';</span>
-<span id="L58" class="LineNr">58 </span>  <span class="Conceal">¦</span> <a href='002test.cc.html#L74'>run_test</a><span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L59" class="LineNr">59 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a><span class="Delimiter">)</span> cerr &lt;&lt; <span class="Constant">'.'</span><span class="Delimiter">;</span>
-<span id="L60" class="LineNr">60 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span> ++num_failures<span class="Delimiter">;</span>
+<span id="L58" class="LineNr">58 </span>    <a href='002test.cc.html#L74'>run_test</a><span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L59" class="LineNr">59 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a><span class="Delimiter">)</span> cerr &lt;&lt; <span class="Constant">'.'</span><span class="Delimiter">;</span>
+<span id="L60" class="LineNr">60 </span>    <span class="Normal">else</span> ++num_failures<span class="Delimiter">;</span>
 <span id="L61" class="LineNr">61 </span>  <span class="Delimiter">}</span>
 <span id="L62" class="LineNr">62 </span>  cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L63" class="LineNr">63 </span>  <span class="Comment">// End Tests</span>
 <span id="L64" class="LineNr">64 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>num_failures &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L65" class="LineNr">65 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; num_failures &lt;&lt; <span class="Constant">&quot; failure&quot;</span>
-<span id="L66" class="LineNr">66 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span>&lt;&lt; <span class="Delimiter">(</span>num_failures &gt; <span class="Constant">1</span> ? <span class="Constant">&quot;s&quot;</span> : <span class="Constant">&quot;&quot;</span><span class="Delimiter">)</span>
-<span id="L67" class="LineNr">67 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span>&lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L68" class="LineNr">68 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L65" class="LineNr">65 </span>    cerr &lt;&lt; num_failures &lt;&lt; <span class="Constant">&quot; failure&quot;</span>
+<span id="L66" class="LineNr">66 </span>         &lt;&lt; <span class="Delimiter">(</span>num_failures &gt; <span class="Constant">1</span> ? <span class="Constant">&quot;s&quot;</span> : <span class="Constant">&quot;&quot;</span><span class="Delimiter">)</span>
+<span id="L67" class="LineNr">67 </span>         &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L68" class="LineNr">68 </span>    <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L69" class="LineNr">69 </span>  <span class="Delimiter">}</span>
 <span id="L70" class="LineNr">70 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L71" class="LineNr">71 </span><span class="Delimiter">}</span>
@@ -135,8 +134,8 @@ if ('onhashchange' in window) {
 <span id="L73" class="LineNr">73 </span><span class="Delimiter">:(code)</span>
 <span id="L74" class="LineNr">74 </span><span class="Normal">void</span> <a href='002test.cc.html#L74'>run_test</a><span class="Delimiter">(</span><span class="Normal">size_t</span> i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L75" class="LineNr">75 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt;= <span class="Normal">sizeof</span><span class="Delimiter">(</span><a href='002test.cc.html#L15'>Tests</a><span class="Delimiter">)</span>/<span class="Normal">sizeof</span><span class="Delimiter">(</span>Tests[<span class="Constant">0</span>]<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L76" class="LineNr">76 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;no test &quot;</span> &lt;&lt; i &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L77" class="LineNr">77 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L76" class="LineNr">76 </span>    cerr &lt;&lt; <span class="Constant">&quot;no test &quot;</span> &lt;&lt; i &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L77" class="LineNr">77 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L78" class="LineNr">78 </span>  <span class="Delimiter">}</span>
 <span id="L79" class="LineNr">79 </span>  <a href='000organization.cc.html#L139'>reset</a><span class="Delimiter">();</span>
 <span id="L80" class="LineNr">80 </span>  <span class="Comment">// End Test Setup</span>
diff --git a/html/subx/003trace.cc.html b/html/subx/003trace.cc.html
index 6850dfad..c20aed7a 100644
--- a/html/subx/003trace.cc.html
+++ b/html/subx/003trace.cc.html
@@ -15,15 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Conceal { color: #4e4e4e; }
 .PreProc { color: #800080; }
 .LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
 .Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
+.Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -166,15 +165,15 @@ if ('onhashchange' in window) {
 <span id="L105" class="LineNr">105 </span>  <a href='003trace.cc.html#L105'>~trace_stream</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L98'>curr_stream</a><span class="Delimiter">)</span> <span class="Normal">delete</span> <a href='003trace.cc.html#L98'>curr_stream</a><span class="Delimiter">;</span> <span class="Delimiter">}</span>
 <span id="L106" class="LineNr">106 </span>
 <span id="L107" class="LineNr">107 </span>  ostream&amp; stream<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> stream<span class="Delimiter">(</span><a href='003trace.cc.html#L92'>Max_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>
+<span id="L108" class="LineNr">108 </span>    <span class="Identifier">return</span> stream<span class="Delimiter">(</span><a href='003trace.cc.html#L92'>Max_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Delimiter">}</span>
 <span id="L110" class="LineNr">110 </span>
 <span id="L111" class="LineNr">111 </span>  ostream&amp; stream<span class="Delimiter">(</span><span class="Normal">int</span> <a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">,</span> string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L112" class="LineNr">112 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L72'>depth</a> &gt; <a href='003trace.cc.html#L102'>collect_depth</a><span class="Delimiter">)</span> <span class="Identifier">return</span> <a href='003trace.cc.html#L103'>null_stream</a><span class="Delimiter">;</span>
-<span id="L113" class="LineNr">113 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L98'>curr_stream</a> = <span class="Normal">new</span> ostringstream<span class="Delimiter">;</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L99'>curr_label</a> = <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">;</span>
-<span id="L115" class="LineNr">115 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L100'>curr_depth</a> = <a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">;</span>
-<span id="L116" class="LineNr">116 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> *curr_stream<span class="Delimiter">;</span>
+<span id="L112" class="LineNr">112 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L72'>depth</a> &gt; <a href='003trace.cc.html#L102'>collect_depth</a><span class="Delimiter">)</span> <span class="Identifier">return</span> <a href='003trace.cc.html#L103'>null_stream</a><span class="Delimiter">;</span>
+<span id="L113" class="LineNr">113 </span>    <a href='003trace.cc.html#L98'>curr_stream</a> = <span class="Normal">new</span> ostringstream<span class="Delimiter">;</span>
+<span id="L114" class="LineNr">114 </span>    <a href='003trace.cc.html#L99'>curr_label</a> = <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">;</span>
+<span id="L115" class="LineNr">115 </span>    <a href='003trace.cc.html#L100'>curr_depth</a> = <a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">;</span>
+<span id="L116" class="LineNr">116 </span>    <span class="Identifier">return</span> *curr_stream<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="Comment">// be sure to call this before messing with curr_stream or curr_label</span>
@@ -188,11 +187,11 @@ if ('onhashchange' in window) {
 <span id="L127" class="LineNr">127 </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="L128" class="LineNr">128 </span>  string curr_contents = <a href='003trace.cc.html#L98'>curr_stream</a><span class="Delimiter">-&gt;</span>str<span class="Delimiter">();</span>
 <span id="L129" class="LineNr">129 </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="L130" class="LineNr">130 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span><a href='003trace.cc.html#L100'>curr_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L99'>curr_label</a><span class="Delimiter">),</span> curr_contents<span class="Delimiter">));</span>  <span class="Comment">// preserve indent in contents</span>
-<span id="L131" class="LineNr">131 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">((</span>!Hide_errors &amp;&amp; <a href='003trace.cc.html#L99'>curr_label</a> == <span class="Constant">&quot;error&quot;</span><span class="Delimiter">)</span>
-<span id="L132" class="LineNr">132 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> || <a href='003trace.cc.html#L81'>Dump_trace</a>
-<span id="L133" class="LineNr">133 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> || <span class="Delimiter">(</span>!Dump_label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; <a href='003trace.cc.html#L99'>curr_label</a> == <a href='003trace.cc.html#L82'>Dump_label</a><span class="Delimiter">))</span>
-<span id="L134" class="LineNr">134 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <a href='003trace.cc.html#L99'>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="L130" class="LineNr">130 </span>    <a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span><a href='003trace.cc.html#L100'>curr_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L99'>curr_label</a><span class="Delimiter">),</span> curr_contents<span class="Delimiter">));</span>  <span class="Comment">// preserve indent in contents</span>
+<span id="L131" class="LineNr">131 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>!Hide_errors &amp;&amp; <a href='003trace.cc.html#L99'>curr_label</a> == <span class="Constant">&quot;error&quot;</span><span class="Delimiter">)</span>
+<span id="L132" class="LineNr">132 </span>        || <a href='003trace.cc.html#L81'>Dump_trace</a>
+<span id="L133" class="LineNr">133 </span>        || <span class="Delimiter">(</span>!Dump_label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; <a href='003trace.cc.html#L99'>curr_label</a> == <a href='003trace.cc.html#L82'>Dump_label</a><span class="Delimiter">))</span>
+<span id="L134" class="LineNr">134 </span>      cerr &lt;&lt; <a href='003trace.cc.html#L99'>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="L135" class="LineNr">135 </span>  <span class="Delimiter">}</span>
 <span id="L136" class="LineNr">136 </span>  <span class="Normal">delete</span> <a href='003trace.cc.html#L98'>curr_stream</a><span class="Delimiter">;</span>
 <span id="L137" class="LineNr">137 </span>  <a href='003trace.cc.html#L98'>curr_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
@@ -204,9 +203,9 @@ if ('onhashchange' in window) {
 <span id="L143" class="LineNr">143 </span>  ostringstream output<span class="Delimiter">;</span>
 <span id="L144" class="LineNr">144 </span>  <a href='003trace.cc.html#L73'>label</a> = <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>
 <span id="L145" class="LineNr">145 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L146" class="LineNr">146 </span>  <span class="Conceal">¦</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="L147" class="LineNr">147 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="L148" class="LineNr">148 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L146" class="LineNr">146 </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="L147" class="LineNr">147 </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="L148" class="LineNr">148 </span>    <span class="Delimiter">}</span>
 <span id="L149" class="LineNr">149 </span>  <span class="Identifier">return</span> output<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L150" class="LineNr">150 </span><span class="Delimiter">}</span>
 <span id="L151" class="LineNr">151 </span>
@@ -263,9 +262,9 @@ if ('onhashchange' in window) {
 <span id="L202" class="LineNr">202 </span>lease_tracer::<a href='003trace.cc.html#L202'>~lease_tracer</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L203" class="LineNr">203 </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 class="Comment">// in case tests close Trace_stream</span>
 <span id="L204" class="LineNr">204 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L192'>Save_trace</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L205" class="LineNr">205 </span>  <span class="Conceal">¦</span> ofstream fout<span class="Delimiter">(</span><span class="Constant">&quot;last_trace&quot;</span><span class="Delimiter">);</span>
-<span id="L206" class="LineNr">206 </span>  <span class="Conceal">¦</span> fout &lt;&lt; <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L142'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L207" class="LineNr">207 </span>  <span class="Conceal">¦</span> fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
+<span id="L205" class="LineNr">205 </span>    ofstream fout<span class="Delimiter">(</span><span class="Constant">&quot;last_trace&quot;</span><span class="Delimiter">);</span>
+<span id="L206" class="LineNr">206 </span>    fout &lt;&lt; <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L142'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L207" class="LineNr">207 </span>    fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
 <span id="L208" class="LineNr">208 </span>  <span class="Delimiter">}</span>
 <span id="L209" class="LineNr">209 </span>  <span class="Normal">delete</span> <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L153'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
 <span id="L210" class="LineNr">210 </span><span class="Delimiter">}</span>
@@ -280,19 +279,19 @@ if ('onhashchange' in window) {
 <span id="L219" class="LineNr">219 </span><span class="PreProc">#define CHECK_TRACE_CONTAINS_ERRORS()  CHECK(trace_contains_errors())</span>
 <span id="L220" class="LineNr">220 </span><span class="PreProc">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span>
 <span id="L221" class="LineNr">221 </span><span class="PreProc">  </span><span class="Normal">if</span><span class="PreProc"> (Passed &amp;&amp; trace_contains_errors()) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
-<span id="L222" class="LineNr">222 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> cerr &lt;&lt; </span><span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): unexpected errors</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L223" class="LineNr">223 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> DUMP(</span><span class="Constant">&quot;error&quot;</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L224" class="LineNr">224 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> <a href='002test.cc.html#L21'>Passed</a> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L225" class="LineNr">225 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L222" class="LineNr">222 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): unexpected errors</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L223" class="LineNr">223 </span><span class="PreProc">    DUMP(</span><span class="Constant">&quot;error&quot;</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L224" class="LineNr">224 </span><span class="PreProc">    <a href='002test.cc.html#L21'>Passed</a> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L225" class="LineNr">225 </span><span class="PreProc">    </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
 <span id="L226" class="LineNr">226 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
 <span id="L227" class="LineNr">227 </span>
 <span id="L228" class="LineNr">228 </span><span class="PreProc">#define CHECK_TRACE_COUNT(label</span><span class="Delimiter">,</span><span class="PreProc"> count) \</span>
 <span id="L229" class="LineNr">229 </span><span class="PreProc">  </span><span class="Normal">if</span><span class="PreProc"> (Passed &amp;&amp; trace_count(label) != (count)) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
-<span id="L230" class="LineNr">230 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> cerr &lt;&lt; </span><span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): trace_count of &quot;</span><span class="PreProc"> &lt;&lt; <a href='003trace.cc.html#L73'>label</a> &lt;&lt; </span><span class="Constant">&quot; should be &quot;</span><span class="PreProc"> &lt;&lt; count &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L231" class="LineNr">231 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> cerr &lt;&lt; </span><span class="Constant">&quot;  got &quot;</span><span class="PreProc"> &lt;&lt; trace_count(label) &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> multiple eval </span><span class="Comment">*/</span><span class="PreProc"> \</span>
-<span id="L232" class="LineNr">232 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> DUMP(label)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L233" class="LineNr">233 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> <a href='002test.cc.html#L21'>Passed</a> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L234" class="LineNr">234 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L230" class="LineNr">230 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): trace_count of &quot;</span><span class="PreProc"> &lt;&lt; <a href='003trace.cc.html#L73'>label</a> &lt;&lt; </span><span class="Constant">&quot; should be &quot;</span><span class="PreProc"> &lt;&lt; count &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L231" class="LineNr">231 </span><span class="PreProc">    cerr &lt;&lt; </span><span class="Constant">&quot;  got &quot;</span><span class="PreProc"> &lt;&lt; trace_count(label) &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> multiple eval </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L232" class="LineNr">232 </span><span class="PreProc">    DUMP(label)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L233" class="LineNr">233 </span><span class="PreProc">    <a href='002test.cc.html#L21'>Passed</a> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L234" class="LineNr">234 </span><span class="PreProc">    </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span><span class="PreProc"> \</span>
 <span id="L235" class="LineNr">235 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
 <span id="L236" class="LineNr">236 </span>
 <span id="L237" class="LineNr">237 </span><span class="PreProc">#define CHECK_TRACE_DOESNT_CONTAIN(</span><span class="Delimiter">...</span><span class="PreProc">)  CHECK(trace_doesnt_contain(</span><span class="Constant">__VA_ARGS__</span><span class="PreProc">))</span>
@@ -304,27 +303,27 @@ if ('onhashchange' in window) {
 <span id="L243" class="LineNr">243 </span>  vector&lt;string&gt; expected_lines = <a href='003trace.cc.html#L330'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;^D&quot;</span><span class="Delimiter">);</span>
 <span id="L244" class="LineNr">244 </span>  <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L245" class="LineNr">245 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L91'>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="L246" class="LineNr">246 </span>  <span class="Conceal">¦</span> ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L246" class="LineNr">246 </span>    ++curr_expected_line<span class="Delimiter">;</span>
 <span id="L247" class="LineNr">247 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L91'>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="L248" class="LineNr">248 </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="L249" class="LineNr">249 </span>  <a href='003trace.cc.html#L272'>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="L250" class="LineNr">250 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L251" class="LineNr">251 </span>  <span class="Conceal">¦</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="L252" class="LineNr">252 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> != <a href='003trace.cc.html#L354'>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="L253" class="LineNr">253 </span>  <span class="Conceal">¦</span> ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L254" class="LineNr">254 </span>  <span class="Conceal">¦</span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L91'>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="L255" class="LineNr">255 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L256" class="LineNr">256 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L91'>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="L257" class="LineNr">257 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L272'>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="L251" class="LineNr">251 </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="L252" class="LineNr">252 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> != <a href='003trace.cc.html#L354'>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="L253" class="LineNr">253 </span>    ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L254" class="LineNr">254 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L91'>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="L255" class="LineNr">255 </span>      ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L256" class="LineNr">256 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L91'>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="L257" class="LineNr">257 </span>    <a href='003trace.cc.html#L272'>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="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="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L285'>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="L261" class="LineNr">261 </span>  <span class="Conceal">¦</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;): line [&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#L160'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L262" class="LineNr">262 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L164'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L261" class="LineNr">261 </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;): line [&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#L160'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L262" class="LineNr">262 </span>    <a href='003trace.cc.html#L164'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L263" class="LineNr">263 </span>  <span class="Delimiter">}</span>
 <span id="L264" class="LineNr">264 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L265" class="LineNr">265 </span>  <span class="Conceal">¦</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#L160'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L266" class="LineNr">266 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L164'>DUMP</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>
+<span id="L265" class="LineNr">265 </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#L160'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L266" class="LineNr">266 </span>    <a href='003trace.cc.html#L164'>DUMP</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>
 <span id="L267" class="LineNr">267 </span>  <span class="Delimiter">}</span>
 <span id="L268" class="LineNr">268 </span>  <a href='002test.cc.html#L21'>Passed</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L269" class="LineNr">269 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
@@ -334,19 +333,19 @@ if ('onhashchange' in window) {
 <span id="L273" class="LineNr">273 </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="L274" class="LineNr">274 </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="L275" class="LineNr">275 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L276" class="LineNr">276 </span>  <span class="Conceal">¦</span> *label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L277" class="LineNr">277 </span>  <span class="Conceal">¦</span> *contents = <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L276" class="LineNr">276 </span>    *label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L277" class="LineNr">277 </span>    *contents = <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">);</span>
 <span id="L278" class="LineNr">278 </span>  <span class="Delimiter">}</span>
 <span id="L279" class="LineNr">279 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L280" class="LineNr">280 </span>  <span class="Conceal">¦</span> *label = <a href='003trace.cc.html#L354'>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="L281" class="LineNr">281 </span>  <span class="Conceal">¦</span> *contents = <a href='003trace.cc.html#L354'>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="L280" class="LineNr">280 </span>    *label = <a href='003trace.cc.html#L354'>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="L281" class="LineNr">281 </span>    *contents = <a href='003trace.cc.html#L354'>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="L282" class="LineNr">282 </span>  <span class="Delimiter">}</span>
 <span id="L283" class="LineNr">283 </span><span class="Delimiter">}</span>
 <span id="L284" class="LineNr">284 </span>
 <span id="L285" class="LineNr">285 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L285'>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="L286" class="LineNr">286 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L287" class="LineNr">287 </span>  <span class="Conceal">¦</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="L288" class="LineNr">288 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> == <a href='003trace.cc.html#L354'>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="L287" class="LineNr">287 </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="L288" class="LineNr">288 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> == <a href='003trace.cc.html#L354'>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="L289" class="LineNr">289 </span>  <span class="Delimiter">}</span>
 <span id="L290" class="LineNr">290 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L291" class="LineNr">291 </span><span class="Delimiter">}</span>
@@ -359,10 +358,10 @@ if ('onhashchange' in window) {
 <span id="L298" class="LineNr">298 </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="L299" class="LineNr">299 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L300" class="LineNr">300 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L301" class="LineNr">301 </span>  <span class="Conceal">¦</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="L302" class="LineNr">302 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>line == <span class="Constant">&quot;&quot;</span> || <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>line<span class="Delimiter">)</span> == <a href='003trace.cc.html#L354'>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="L303" class="LineNr">303 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++result<span class="Delimiter">;</span>
-<span id="L304" class="LineNr">304 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L301" class="LineNr">301 </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="L302" class="LineNr">302 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>line == <span class="Constant">&quot;&quot;</span> || <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>line<span class="Delimiter">)</span> == <a href='003trace.cc.html#L354'>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="L303" class="LineNr">303 </span>        ++result<span class="Delimiter">;</span>
+<span id="L304" class="LineNr">304 </span>    <span class="Delimiter">}</span>
 <span id="L305" class="LineNr">305 </span>  <span class="Delimiter">}</span>
 <span id="L306" class="LineNr">306 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L307" class="LineNr">307 </span><span class="Delimiter">}</span>
@@ -371,10 +370,10 @@ if ('onhashchange' in window) {
 <span id="L310" class="LineNr">310 </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="L311" class="LineNr">311 </span>  <span class="Normal">long</span> result = <span class="Constant">0</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#L153'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L313" class="LineNr">313 </span>  <span class="Conceal">¦</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="L314" class="LineNr">314 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L27'>starts_with</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>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#L354'>trim</a><span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span>
-<span id="L315" class="LineNr">315 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++result<span class="Delimiter">;</span>
-<span id="L316" class="LineNr">316 </span>  <span class="Conceal">¦</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="Delimiter">{</span>
+<span id="L314" class="LineNr">314 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L27'>starts_with</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>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#L354'>trim</a><span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span>
+<span id="L315" class="LineNr">315 </span>        ++result<span class="Delimiter">;</span>
+<span id="L316" class="LineNr">316 </span>    <span class="Delimiter">}</span>
 <span id="L317" class="LineNr">317 </span>  <span class="Delimiter">}</span>
 <span id="L318" class="LineNr">318 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L319" class="LineNr">319 </span><span class="Delimiter">}</span>
@@ -392,13 +391,13 @@ if ('onhashchange' in window) {
 <span id="L331" class="LineNr">331 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
 <span id="L332" class="LineNr">332 </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="L333" class="LineNr">333 </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="L334" class="LineNr">334 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L184'>end</a> == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L335" class="LineNr">335 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="L336" class="LineNr">336 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L337" class="LineNr">337 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L338" class="LineNr">338 </span>  <span class="Conceal">¦</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="L339" class="LineNr">339 </span>  <span class="Conceal">¦</span> begin = end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L340" class="LineNr">340 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L184'>end</a> = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">,</span> begin<span class="Delimiter">);</span>
+<span id="L334" class="LineNr">334 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L184'>end</a> == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L335" class="LineNr">335 </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="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>    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="L339" class="LineNr">339 </span>    begin = end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L340" class="LineNr">340 </span>    <a href='003trace.cc.html#L184'>end</a> = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">,</span> begin<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>
@@ -408,19 +407,19 @@ if ('onhashchange' in window) {
 <span id="L347" class="LineNr">347 </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="L348" class="LineNr">348 </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#L184'>end</a><span class="Delimiter">));</span>
 <span id="L349" class="LineNr">349 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L184'>end</a> != string::npos<span class="Delimiter">)</span>
-<span id="L350" class="LineNr">350 </span>  <span class="Conceal">¦</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="L350" class="LineNr">350 </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="L351" class="LineNr">351 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L352" class="LineNr">352 </span><span class="Delimiter">}</span>
 <span id="L353" class="LineNr">353 </span>
 <span id="L354" class="LineNr">354 </span>string <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L355" class="LineNr">355 </span>  string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
 <span id="L356" class="LineNr">356 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>first != s<span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*first<span class="Delimiter">))</span>
-<span id="L357" class="LineNr">357 </span>  <span class="Conceal">¦</span> ++first<span class="Delimiter">;</span>
+<span id="L357" class="LineNr">357 </span>    ++first<span class="Delimiter">;</span>
 <span id="L358" class="LineNr">358 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>first == s<span class="Delimiter">.</span><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="L359" class="LineNr">359 </span>
 <span id="L360" class="LineNr">360 </span>  string::const_iterator last = --s<span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L361" class="LineNr">361 </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="L362" class="LineNr">362 </span>  <span class="Conceal">¦</span> --last<span class="Delimiter">;</span>
+<span id="L362" class="LineNr">362 </span>    --last<span class="Delimiter">;</span>
 <span id="L363" class="LineNr">363 </span>  ++last<span class="Delimiter">;</span>
 <span id="L364" class="LineNr">364 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>first<span class="Delimiter">,</span> last<span class="Delimiter">);</span>
 <span id="L365" class="LineNr">365 </span><span class="Delimiter">}</span>
diff --git a/html/subx/003trace.test.cc.html b/html/subx/003trace.test.cc.html
index 10ce2b51..2d875c8b 100644
--- a/html/subx/003trace.test.cc.html
+++ b/html/subx/003trace.test.cc.html
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.cSpecial { color: #008000; }
 .LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/subx/010core.cc.html b/html/subx/010core.cc.html
index f1dbbeeb..4488688c 100644
--- a/html/subx/010core.cc.html
+++ b/html/subx/010core.cc.html
@@ -15,18 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Conceal { color: #4e4e4e; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
+.cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 .PreProc { color: #800080; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Delimiter { color: #800080; }
+.Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .SalientComment { color: #00ffff; }
-.traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
@@ -107,7 +106,7 @@ if ('onhashchange' in window) {
 <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#L230'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end()</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>
@@ -118,7 +117,7 @@ if ('onhashchange' in window) {
 <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#L230'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end()</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>
@@ -148,7 +147,7 @@ if ('onhashchange' in window) {
 <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="Conceal">¦</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="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>
@@ -165,52 +164,52 @@ if ('onhashchange' in window) {
 <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>  <span class="Conceal">¦</span> <a href='010core.cc.html#L109'>run_one_instruction</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#L230'>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="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>  <span class="Conceal">¦</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="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</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="Conceal">¦</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>  <span class="Conceal">¦</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#L230'>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>  <span class="Conceal">¦</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="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</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="Conceal">¦</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="Conceal">¦</span> <span class="Comment">// End Two-Byte Opcodes Starting With 0f</span>
-<span id="L127" class="LineNr">127 </span>  <span class="Conceal">¦</span> <span class="Normal">default</span>:
-<span id="L128" class="LineNr">128 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after 0f: &quot;</span> &lt;&lt; <a href='010core.cc.html#L229'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L232'>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>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L130" class="LineNr">130 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L131" class="LineNr">131 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</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="Conceal">¦</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="Conceal">¦</span> <span class="Comment">// End Two-Byte Opcodes Starting With f3</span>
-<span id="L135" class="LineNr">135 </span>  <span class="Conceal">¦</span> <span class="Normal">case</span> <span class="Constant">0x0f</span>:
-<span id="L136" class="LineNr">136 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// End Three-Byte Opcodes Starting With f3 0f</span>
-<span id="L138" class="LineNr">138 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">default</span>:
-<span id="L139" class="LineNr">139 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f3 0f: &quot;</span> &lt;&lt; <a href='010core.cc.html#L229'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L232'>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>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L143" class="LineNr">143 </span>  <span class="Conceal">¦</span> <span class="Normal">default</span>:
-<span id="L144" class="LineNr">144 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f3: &quot;</span> &lt;&lt; <a href='010core.cc.html#L229'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L232'>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>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L146" class="LineNr">146 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L147" class="LineNr">147 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</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>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized opcode: &quot;</span> &lt;&lt; <a href='010core.cc.html#L229'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L232'>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>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</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>
@@ -219,47 +218,47 @@ if ('onhashchange' in window) {
 <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="Conceal">¦</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="Conceal">¦</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="Conceal">¦</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>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L164" class="LineNr">164 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L165" class="LineNr">165 </span>  <span class="Conceal">¦</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="Conceal">¦</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>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L169" class="LineNr">169 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L170" class="LineNr">170 </span>  <span class="Conceal">¦</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>  <span class="Conceal">¦</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#L229'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L232'>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>  <span class="Conceal">¦</span> addr++<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="Conceal">¦</span> <span class="Normal">char</span> c = <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
-<span id="L180" class="LineNr">180 </span>  <span class="Conceal">¦</span> in &gt;&gt; c<span class="Delimiter">;</span>
-<span id="L181" class="LineNr">181 </span>  <span class="Conceal">¦</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="Conceal">¦</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="Conceal">¦</span> <span class="Conceal">¦</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>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> in &gt;&gt; c<span class="Delimiter">;</span>
-<span id="L185" class="LineNr">185 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> in &gt;&gt; c<span class="Delimiter">;</span>
-<span id="L187" class="LineNr">187 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L188" class="LineNr">188 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L189" class="LineNr">189 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L190" class="LineNr">190 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L191" class="LineNr">191 </span>  <span class="Conceal">¦</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="Conceal">¦</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="Conceal">¦</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="Conceal">¦</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="Conceal">¦</span> <span class="Comment">// disallow any non-hex characters, including a '0x' prefix</span>
-<span id="L196" class="LineNr">196 </span>  <span class="Conceal">¦</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>  <span class="Conceal">¦</span> <span class="Conceal">¦</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#L232'>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="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L199" class="LineNr">199 </span>  <span class="Conceal">¦</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>
@@ -287,13 +286,27 @@ if ('onhashchange' in window) {
 <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><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L228" class="LineNr">228 </span><span class="PreProc">#include </span><span class="Constant">&lt;iomanip&gt;</span>
-<span id="L229" class="LineNr">229 </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="L230" class="LineNr">230 </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="L231" class="LineNr">231 </span><span class="Comment">// ugly that iostream doesn't print uint8_t as an integer</span>
-<span id="L232" class="LineNr">232 </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="L233" class="LineNr">233 </span><span class="PreProc">#include </span><span class="Constant">&lt;stdint.h&gt;</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>
diff --git a/html/subx/011direct_addressing.cc.html b/html/subx/011direct_addressing.cc.html
index 810eea89..b1441467 100644
--- a/html/subx/011direct_addressing.cc.html
+++ b/html/subx/011direct_addressing.cc.html
@@ -15,20 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Conceal { color: #4e4e4e; }
+.cSpecial { color: #008000; }
 .traceContains { color: #008000; }
-.PreProc { color: #800080; }
+.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
 .LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .SalientComment { color: #00ffff; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
-.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.Special { color: #c00000; }
-.cSpecial { color: #008000; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
+.PreProc { color: #800080; }
 -->
 </style>
 
@@ -69,283 +68,322 @@ if ('onhashchange' in window) {
 <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 (reg 3) to EAX (reg 0)</span>
-<span id="L8" class="LineNr">  8 </span><span class="traceContains">+run: add <a href='010core.cc.html#L17'>reg</a> 3 to effective address</span>
-<span id="L9" class="LineNr">  9 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
-<span id="L10" class="LineNr"> 10 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L11" class="LineNr"> 11 </span>
-<span id="L12" class="LineNr"> 12 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L13" class="LineNr"> 13 </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="L14" class="LineNr"> 14 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L15" class="LineNr"> 15 </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="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;add <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L17" class="LineNr"> 17 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L18" class="LineNr"> 18 </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="L19" class="LineNr"> 19 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Delimiter">}</span>
-<span id="L21" class="LineNr"> 21 </span>
-<span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(code)</span>
-<span id="L23" class="LineNr"> 23 </span><span class="Comment">// Implement tables 2-2 and 2-3 in the Intel manual, Volume 2.</span>
-<span id="L24" class="LineNr"> 24 </span><span class="Comment">// We return a pointer so that instructions can write to multiple bytes in</span>
-<span id="L25" class="LineNr"> 25 </span><span class="Comment">// 'Mem' at once.</span>
-<span id="L26" class="LineNr"> 26 </span><span class="Normal">int32_t</span>* <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L27" class="LineNr"> 27 </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="L28" class="LineNr"> 28 </span>  <span class="Comment">// ignore middle 3 'reg opcode' bits</span>
-<span id="L29" class="LineNr"> 29 </span>  <span class="Normal">uint8_t</span> rm = modrm &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L30" class="LineNr"> 30 </span>  <span class="Normal">int32_t</span>* result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L31" class="LineNr"> 31 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="Normal">case</span> <span class="Constant">3</span>:
-<span id="L33" class="LineNr"> 33 </span>  <span class="Conceal">¦</span> <span class="Comment">// mod 3 is just register direct addressing</span>
-<span id="L34" class="LineNr"> 34 </span>  <span class="Conceal">¦</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 <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</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="L35" class="LineNr"> 35 </span>  <span class="Conceal">¦</span> result = &amp;Reg[rm]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L36" class="LineNr"> 36 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L37" class="LineNr"> 37 </span>  <span class="Comment">// End Mod Special-cases</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>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized mod bits: &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>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>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</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="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L43" class="LineNr"> 43 </span><span class="Delimiter">}</span>
-<span id="L44" class="LineNr"> 44 </span>
-<span id="L45" class="LineNr"> 45 </span><span class="SalientComment">//:: subtract</span>
-<span id="L46" class="LineNr"> 46 </span>
-<span id="L47" class="LineNr"> 47 </span><span class="Delimiter">:(scenario subtract_r32_from_r32)</span>
-<span id="L48" class="LineNr"> 48 </span><span class="Special">% Reg[0].i = 10;</span>
-<span id="L49" class="LineNr"> 49 </span><span class="Special">% Reg[3].i = 1;</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>  <span class="Constant">29</span>  d8                                      <span class="Comment"># subtract EBX (reg 3) from EAX (reg 0)</span>
-<span id="L52" class="LineNr"> 52 </span><span class="traceContains">+run: subtract <a href='010core.cc.html#L17'>reg</a> 3 from effective address</span>
-<span id="L53" class="LineNr"> 53 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
-<span id="L54" class="LineNr"> 54 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L55" class="LineNr"> 55 </span>
-<span id="L56" class="LineNr"> 56 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L57" class="LineNr"> 57 </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="L58" class="LineNr"> 58 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L59" class="LineNr"> 59 </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="L60" class="LineNr"> 60 </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#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; from effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L61" class="LineNr"> 61 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L62" class="LineNr"> 62 </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="L63" class="LineNr"> 63 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L64" class="LineNr"> 64 </span><span class="Delimiter">}</span>
-<span id="L65" class="LineNr"> 65 </span>
-<span id="L66" class="LineNr"> 66 </span><span class="SalientComment">//:: and</span>
-<span id="L67" class="LineNr"> 67 </span>
-<span id="L68" class="LineNr"> 68 </span><span class="Delimiter">:(scenario and_r32_with_r32)</span>
-<span id="L69" class="LineNr"> 69 </span><span class="Special">% Reg[0].i = 0x0a0b0c0d;</span>
-<span id="L70" class="LineNr"> 70 </span><span class="Special">% Reg[3].i = 0x000000ff;</span>
-<span id="L71" class="LineNr"> 71 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L72" class="LineNr"> 72 </span>  <span class="Constant">21</span>  d8                                      <span class="Comment"># and EBX (reg 3) with destination EAX (reg 0)</span>
-<span id="L73" class="LineNr"> 73 </span><span class="traceContains">+run: and <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
-<span id="L74" class="LineNr"> 74 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
-<span id="L75" class="LineNr"> 75 </span><span class="traceContains">+run: storing 0x0000000d</span>
-<span id="L76" class="LineNr"> 76 </span>
-<span id="L77" class="LineNr"> 77 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L78" class="LineNr"> 78 </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="L79" class="LineNr"> 79 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L80" class="LineNr"> 80 </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="L81" class="LineNr"> 81 </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#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L82" class="LineNr"> 82 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L83" class="LineNr"> 83 </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="L84" class="LineNr"> 84 </span>  <span class="Identifier">break</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="SalientComment">//:: or</span>
-<span id="L88" class="LineNr"> 88 </span>
-<span id="L89" class="LineNr"> 89 </span><span class="Delimiter">:(scenario or_r32_with_r32)</span>
-<span id="L90" class="LineNr"> 90 </span><span class="Special">% Reg[0].i = 0x0a0b0c0d;</span>
-<span id="L91" class="LineNr"> 91 </span><span class="Special">% Reg[3].i = 0xa0b0c0d0;</span>
-<span id="L92" class="LineNr"> 92 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Error">09</span>  d8                                      <span class="Comment"># or EBX (reg 3) with destination EAX (reg 0)</span>
-<span id="L94" class="LineNr"> 94 </span><span class="traceContains">+run: or <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
-<span id="L95" class="LineNr"> 95 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
-<span id="L96" class="LineNr"> 96 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
-<span id="L97" class="LineNr"> 97 </span>
-<span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L99" class="LineNr"> 99 </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="L100" class="LineNr">100 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L101" class="LineNr">101 </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="L102" class="LineNr">102 </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#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L103" class="LineNr">103 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L104" class="LineNr">104 </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="L105" class="LineNr">105 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L106" class="LineNr">106 </span><span class="Delimiter">}</span>
-<span id="L107" class="LineNr">107 </span>
-<span id="L108" class="LineNr">108 </span><span class="SalientComment">//:: xor</span>
-<span id="L109" class="LineNr">109 </span>
-<span id="L110" class="LineNr">110 </span><span class="Delimiter">:(scenario xor_r32_with_r32)</span>
-<span id="L111" class="LineNr">111 </span><span class="Special">% Reg[0].i = 0x0a0b0c0d;</span>
-<span id="L112" class="LineNr">112 </span><span class="Special">% Reg[3].i = 0xaabbc0d0;</span>
-<span id="L113" class="LineNr">113 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Constant">31</span>  d8                                      <span class="Comment"># xor EBX (reg 3) with destination EAX (reg 0)</span>
-<span id="L115" class="LineNr">115 </span><span class="traceContains">+run: xor <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
-<span id="L116" class="LineNr">116 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
-<span id="L117" class="LineNr">117 </span><span class="traceContains">+run: storing 0xa0b0ccdd</span>
-<span id="L118" class="LineNr">118 </span>
-<span id="L119" class="LineNr">119 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L120" class="LineNr">120 </span><span class="Normal">case</span> <span class="Constant">0x31</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
-<span id="L121" class="LineNr">121 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L122" class="LineNr">122 </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="L123" class="LineNr">123 </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#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L124" class="LineNr">124 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L125" class="LineNr">125 </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="L126" class="LineNr">126 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L127" class="LineNr">127 </span><span class="Delimiter">}</span>
-<span id="L128" class="LineNr">128 </span>
-<span id="L129" class="LineNr">129 </span><span class="SalientComment">//:: not</span>
-<span id="L130" class="LineNr">130 </span>
-<span id="L131" class="LineNr">131 </span><span class="Delimiter">:(scenario not_r32)</span>
-<span id="L132" class="LineNr">132 </span><span class="Special">% Reg[3].i = 0x0f0f00ff;</span>
-<span id="L133" class="LineNr">133 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L134" class="LineNr">134 </span>  f7  c3                                      <span class="Comment"># not EBX (reg 3)</span>
-<span id="L135" class="LineNr">135 </span><span class="traceContains">+run: 'not' of effective address</span>
-<span id="L136" class="LineNr">136 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L137" class="LineNr">137 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
-<span id="L138" class="LineNr">138 </span>
-<span id="L139" class="LineNr">139 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L140" class="LineNr">140 </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="L141" class="LineNr">141 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L142" class="LineNr">142 </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 effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L143" class="LineNr">143 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L144" class="LineNr">144 </span>  *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
-<span id="L145" class="LineNr">145 </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#L230'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L146" class="LineNr">146 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
-<span id="L147" class="LineNr">147 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L148" class="LineNr">148 </span>  <a href='010core.cc.html#L33'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L150" class="LineNr">150 </span><span class="Delimiter">}</span>
-<span id="L151" class="LineNr">151 </span>
-<span id="L152" class="LineNr">152 </span><span class="SalientComment">//:: compare (cmp)</span>
-<span id="L153" class="LineNr">153 </span>
-<span id="L154" class="LineNr">154 </span><span class="Delimiter">:(scenario compare_r32_with_r32_greater)</span>
-<span id="L155" class="LineNr">155 </span><span class="Special">% Reg[0].i = 0x0a0b0c0d;</span>
-<span id="L156" class="LineNr">156 </span><span class="Special">% Reg[3].i = 0x0a0b0c07;</span>
-<span id="L157" class="LineNr">157 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX (reg 3) with EAX (reg 0)</span>
-<span id="L159" class="LineNr">159 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
-<span id="L160" class="LineNr">160 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
-<span id="L161" class="LineNr">161 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L162" class="LineNr">162 </span>
-<span id="L163" class="LineNr">163 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L164" class="LineNr">164 </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="L165" class="LineNr">165 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L166" class="LineNr">166 </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="L167" class="LineNr">167 </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#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with effective address&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="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L169" class="LineNr">169 </span>  <span class="Normal">int32_t</span> arg2 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L170" class="LineNr">170 </span>  <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L171" class="LineNr">171 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L172" class="LineNr">172 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L173" class="LineNr">173 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L174" class="LineNr">174 </span>  <a href='010core.cc.html#L33'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L175" class="LineNr">175 </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="L176" class="LineNr">176 </span>  <span class="Identifier">break</span><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="Delimiter">:(scenario compare_r32_with_r32_lesser)</span>
-<span id="L180" class="LineNr">180 </span><span class="Special">% Reg[0].i = 0x0a0b0c07;</span>
-<span id="L181" class="LineNr">181 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
-<span id="L182" class="LineNr">182 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L183" class="LineNr">183 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX (reg 3) with EAX (reg 0)</span>
-<span id="L184" class="LineNr">184 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
-<span id="L185" class="LineNr">185 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
-<span id="L186" class="LineNr">186 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</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_equal)</span>
-<span id="L189" class="LineNr">189 </span><span class="Special">% Reg[0].i = 0x0a0b0c0d;</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  ModRM   SIB   displacement  immediate</span>
-<span id="L192" class="LineNr">192 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX (reg 3) with EAX (reg 0)</span>
-<span id="L193" class="LineNr">193 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
-<span id="L194" class="LineNr">194 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
-<span id="L195" class="LineNr">195 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L196" class="LineNr">196 </span>
-<span id="L197" class="LineNr">197 </span><span class="SalientComment">//:: copy (mov)</span>
-<span id="L198" class="LineNr">198 </span>
-<span id="L199" class="LineNr">199 </span><span class="Delimiter">:(scenario copy_r32_to_r32)</span>
-<span id="L200" class="LineNr">200 </span><span class="Special">% Reg[3].i = 0xaf;</span>
-<span id="L201" class="LineNr">201 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L202" class="LineNr">202 </span>  <span class="Constant">89</span>  d8                                      <span class="Comment"># copy EBX (reg 3) to EAX (reg 0)</span>
-<span id="L203" class="LineNr">203 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L17'>reg</a> 3 to effective address</span>
-<span id="L204" class="LineNr">204 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
-<span id="L205" class="LineNr">205 </span><span class="traceContains">+run: storing 0x000000af</span>
-<span id="L206" class="LineNr">206 </span>
-<span id="L207" class="LineNr">207 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L208" class="LineNr">208 </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="L209" class="LineNr">209 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L210" class="LineNr">210 </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="L211" class="LineNr">211 </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#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L212" class="LineNr">212 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L213" class="LineNr">213 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L214" class="LineNr">214 </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#L230'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Identifier">break</span><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="SalientComment">//:: push</span>
-<span id="L219" class="LineNr">219 </span>
-<span id="L220" class="LineNr">220 </span><span class="Delimiter">:(scenario push_r32)</span>
-<span id="L221" class="LineNr">221 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L222" class="LineNr">222 </span><span class="Special">% Reg[EBX].i = 0x0000000a;</span>
-<span id="L223" class="LineNr">223 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L224" class="LineNr">224 </span>  <span class="Constant">53</span>                                          <span class="Comment"># push EBX (reg 3) to stack</span>
-<span id="L225" class="LineNr">225 </span><span class="traceContains">+run: <a href='011direct_addressing.cc.html#L244'>push</a> <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L226" class="LineNr">226 </span><span class="traceContains">+run: decrementing <a href='010core.cc.html#L11'>ESP</a> to 0x00000060</span>
-<span id="L227" class="LineNr">227 </span><span class="traceContains">+run: pushing value 0x0000000a</span>
-<span id="L228" class="LineNr">228 </span>
-<span id="L229" class="LineNr">229 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L230" class="LineNr">230 </span><span class="Normal">case</span> <span class="Constant">0x50</span>:
-<span id="L231" class="LineNr">231 </span><span class="Normal">case</span> <span class="Constant">0x51</span>:
-<span id="L232" class="LineNr">232 </span><span class="Normal">case</span> <span class="Constant">0x52</span>:
-<span id="L233" class="LineNr">233 </span><span class="Normal">case</span> <span class="Constant">0x53</span>:
-<span id="L234" class="LineNr">234 </span><span class="Normal">case</span> <span class="Constant">0x54</span>:
-<span id="L235" class="LineNr">235 </span><span class="Normal">case</span> <span class="Constant">0x55</span>:
-<span id="L236" class="LineNr">236 </span><span class="Normal">case</span> <span class="Constant">0x56</span>:
-<span id="L237" class="LineNr">237 </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="L238" class="LineNr">238 </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="L239" class="LineNr">239 </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#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</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="L240" class="LineNr">240 </span>  <a href='011direct_addressing.cc.html#L244'>push</a><span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L241" class="LineNr">241 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L242" class="LineNr">242 </span><span class="Delimiter">}</span>
-<span id="L243" class="LineNr">243 </span><span class="Delimiter">:(code)</span>
-<span id="L244" class="LineNr">244 </span><span class="Normal">void</span> <a href='011direct_addressing.cc.html#L244'>push</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L245" class="LineNr">245 </span>  Reg[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L246" class="LineNr">246 </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#L230'>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="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;pushing value 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L248" class="LineNr">248 </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="L249" class="LineNr">249 </span><span class="Delimiter">}</span>
-<span id="L250" class="LineNr">250 </span>
-<span id="L251" class="LineNr">251 </span><span class="SalientComment">//:: pop</span>
-<span id="L252" class="LineNr">252 </span>
-<span id="L253" class="LineNr">253 </span><span class="Delimiter">:(scenario pop_r32)</span>
-<span id="L254" class="LineNr">254 </span><span class="Special">% Reg[ESP].u = 0x60;</span>
-<span id="L255" class="LineNr">255 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0000000a);</span>
-<span id="L256" class="LineNr">256 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L257" class="LineNr">257 </span>  5b                                          <span class="Comment"># pop stack to EBX (reg 3)</span>
-<span id="L258" class="LineNr">258 </span><span class="traceContains">+run: <a href='011direct_addressing.cc.html#L277'>pop</a> into <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L259" class="LineNr">259 </span><span class="traceContains">+run: popping value 0x0000000a</span>
-<span id="L260" class="LineNr">260 </span><span class="traceContains">+run: incrementing <a href='010core.cc.html#L11'>ESP</a> to 0x00000064</span>
-<span id="L261" class="LineNr">261 </span>
-<span id="L262" class="LineNr">262 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L263" class="LineNr">263 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
-<span id="L264" class="LineNr">264 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
-<span id="L265" class="LineNr">265 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
-<span id="L266" class="LineNr">266 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
-<span id="L267" class="LineNr">267 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
-<span id="L268" class="LineNr">268 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
-<span id="L269" class="LineNr">269 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
-<span id="L270" class="LineNr">270 </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="L271" class="LineNr">271 </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="L272" class="LineNr">272 </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 <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</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="L273" class="LineNr">273 </span>  Reg[reg]<span class="Delimiter">.</span>u = <a href='011direct_addressing.cc.html#L277'>pop</a><span class="Delimiter">();</span>
-<span id="L274" class="LineNr">274 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L275" class="LineNr">275 </span><span class="Delimiter">}</span>
-<span id="L276" class="LineNr">276 </span><span class="Delimiter">:(code)</span>
-<span id="L277" class="LineNr">277 </span><span class="Normal">uint32_t</span> <a href='011direct_addressing.cc.html#L277'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L278" class="LineNr">278 </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="L279" class="LineNr">279 </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#L230'>HEXWORD</a> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L280" class="LineNr">280 </span>  Reg[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L281" class="LineNr">281 </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#L230'>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="L282" class="LineNr">282 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L283" class="LineNr">283 </span><span class="Delimiter">}</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>
diff --git a/html/subx/012indirect_addressing.cc.html b/html/subx/012indirect_addressing.cc.html
index e202704a..407c1880 100644
--- a/html/subx/012indirect_addressing.cc.html
+++ b/html/subx/012indirect_addressing.cc.html
@@ -15,20 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Conceal { color: #4e4e4e; }
+.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
 .traceContains { color: #008000; }
-.PreProc { color: #800080; }
 .LineNr { color: #444444; }
-.SalientComment { color: #00ffff; }
-.Identifier { color: #c0a020; }
 .traceAbsent { color: #c00000; }
 .Constant { color: #00a0a0; }
+.SalientComment { color: #00ffff; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
+.Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.Special { color: #c00000; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
+.PreProc { color: #800080; }
 -->
 </style>
 
@@ -70,42 +69,42 @@ if ('onhashchange' in window) {
 <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 (reg 3) to *EAX (reg 0)</span>
-<span id="L9" class="LineNr">  9 </span><span class="traceContains">+run: add <a href='010core.cc.html#L17'>reg</a> 3 to effective address</span>
-<span id="L10" class="LineNr"> 10 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</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 Mod Special-cases&quot;)</span>
-<span id="L14" class="LineNr"> 14 </span><span class="Normal">case</span> <span class="Constant">0</span>:
-<span id="L15" class="LineNr"> 15 </span>  <span class="Comment">// mod 0 is usually indirect addressing</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 id="L18" class="LineNr"> 18 </span>  <span class="Conceal">¦</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 mem at address 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; Reg[rm]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; (reg &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</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>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>Reg[rm]<span class="Delimiter">.</span>u + <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="L20" class="LineNr"> 20 </span>  <span class="Conceal">¦</span> result = <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>Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">));</span>  <span class="Comment">// rely on the host itself being in little-endian order</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Comment">// End Mod 0 Special-cases</span>
-<span id="L23" class="LineNr"> 23 </span>  <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 id="L26" class="LineNr"> 26 </span><span class="Comment">//:</span>
-<span id="L27" class="LineNr"> 27 </span>
-<span id="L28" class="LineNr"> 28 </span><span class="Delimiter">:(scenario add_mem_at_r32_to_r32)</span>
-<span id="L29" class="LineNr"> 29 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L30" class="LineNr"> 30 </span><span class="Special">% Reg[3].i = 0x10;</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L32" class="LineNr"> 32 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L33" class="LineNr"> 33 </span>  <span class="PreProc">0</span><span class="Constant">3</span>  <span class="Constant">18</span>                                      <span class="Comment"># add *EAX (reg 0) to EBX (reg 3)</span>
-<span id="L34" class="LineNr"> 34 </span><span class="traceContains">+run: add effective address to <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L35" class="LineNr"> 35 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</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 effective address to <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</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#L26'>effective_address</a><span class="Delimiter">(</span>modrm<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>
@@ -116,342 +115,462 @@ if ('onhashchange' in window) {
 <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  ModRM   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 (reg 3) from *EAX (reg 0)</span>
-<span id="L56" class="LineNr"> 56 </span><span class="traceContains">+run: subtract <a href='010core.cc.html#L17'>reg</a> 3 from effective address</span>
-<span id="L57" class="LineNr"> 57 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</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="Comment">//:</span>
-<span id="L61" class="LineNr"> 61 </span>
-<span id="L62" class="LineNr"> 62 </span><span class="Delimiter">:(scenario subtract_mem_at_r32_from_r32)</span>
-<span id="L63" class="LineNr"> 63 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L64" class="LineNr"> 64 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L65" class="LineNr"> 65 </span><span class="Special">% Reg[3].i = 10;</span>
-<span id="L66" class="LineNr"> 66 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L67" class="LineNr"> 67 </span>  2b  <span class="Constant">18</span>                                      <span class="Comment"># subtract *EAX (reg 0) from EBX (reg 3)</span>
-<span id="L68" class="LineNr"> 68 </span><span class="traceContains">+run: subtract effective address from <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L69" class="LineNr"> 69 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L70" class="LineNr"> 70 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L71" class="LineNr"> 71 </span>
-<span id="L72" class="LineNr"> 72 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L73" class="LineNr"> 73 </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="L74" class="LineNr"> 74 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L75" class="LineNr"> 75 </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="L76" class="LineNr"> 76 </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 effective address from <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</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="L77" class="LineNr"> 77 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L78" class="LineNr"> 78 </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="L79" class="LineNr"> 79 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L80" class="LineNr"> 80 </span><span class="Delimiter">}</span>
-<span id="L81" class="LineNr"> 81 </span>
-<span id="L82" class="LineNr"> 82 </span><span class="SalientComment">//:: and</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="Delimiter">:(scenario and_r32_with_mem_at_r32)</span>
-<span id="L85" class="LineNr"> 85 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L86" class="LineNr"> 86 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c0d);</span>
-<span id="L87" class="LineNr"> 87 </span><span class="Special">% Reg[3].i = 0xff;</span>
-<span id="L88" class="LineNr"> 88 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L89" class="LineNr"> 89 </span>  <span class="Constant">21</span>  <span class="Constant">18</span>                                      <span class="Comment"># and EBX (reg 3) with *EAX (reg 0)</span>
-<span id="L90" class="LineNr"> 90 </span><span class="traceContains">+run: and <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
-<span id="L91" class="LineNr"> 91 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L92" class="LineNr"> 92 </span><span class="traceContains">+run: storing 0x0000000d</span>
-<span id="L93" class="LineNr"> 93 </span>
-<span id="L94" class="LineNr"> 94 </span><span class="Comment">//:</span>
-<span id="L95" class="LineNr"> 95 </span>
-<span id="L96" class="LineNr"> 96 </span><span class="Delimiter">:(scenario and_mem_at_r32_with_r32)</span>
-<span id="L97" class="LineNr"> 97 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L98" class="LineNr"> 98 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x000000ff);</span>
-<span id="L99" class="LineNr"> 99 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
-<span id="L100" class="LineNr">100 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L101" class="LineNr">101 </span>  <span class="Constant">23</span>  <span class="Constant">18</span>                                      <span class="Comment"># and *EAX (reg 0) with EBX (reg 3)</span>
-<span id="L102" class="LineNr">102 </span><span class="traceContains">+run: and effective address with <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L103" class="LineNr">103 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L104" class="LineNr">104 </span><span class="traceContains">+run: storing 0x0000000d</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">0x23</span>: <span class="Delimiter">{</span>  <span class="Comment">// and r/m32 with r32</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L109" class="LineNr">109 </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="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;and effective address with <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</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="L111" class="LineNr">111 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L112" class="LineNr">112 </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="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="L117" class="LineNr">117 </span>
-<span id="L118" class="LineNr">118 </span><span class="Delimiter">:(scenario or_r32_with_mem_at_r32)</span>
-<span id="L119" class="LineNr">119 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L120" class="LineNr">120 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c0d);</span>
-<span id="L121" class="LineNr">121 </span><span class="Special">% Reg[3].i = 0xa0b0c0d0;</span>
-<span id="L122" class="LineNr">122 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L123" class="LineNr">123 </span>  <span class="Error">09</span>  <span class="Constant">18</span>                                      <span class="Comment"># or EBX (reg 3) with *EAX (reg 0)</span>
-<span id="L124" class="LineNr">124 </span><span class="traceContains">+run: or <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
-<span id="L125" class="LineNr">125 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L126" class="LineNr">126 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
-<span id="L127" class="LineNr">127 </span>
-<span id="L128" class="LineNr">128 </span><span class="Comment">//:</span>
-<span id="L129" class="LineNr">129 </span>
-<span id="L130" class="LineNr">130 </span><span class="Delimiter">:(scenario or_mem_at_r32_with_r32)</span>
-<span id="L131" class="LineNr">131 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L132" class="LineNr">132 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c0d);</span>
-<span id="L133" class="LineNr">133 </span><span class="Special">% Reg[3].i = 0xa0b0c0d0;</span>
-<span id="L134" class="LineNr">134 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L135" class="LineNr">135 </span>  0b  <span class="Constant">18</span>                                      <span class="Comment"># or *EAX (reg 0) with EBX (reg 3)</span>
-<span id="L136" class="LineNr">136 </span><span class="traceContains">+run: or effective address with <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L137" class="LineNr">137 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L138" class="LineNr">138 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
-<span id="L139" class="LineNr">139 </span>
-<span id="L140" class="LineNr">140 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L141" class="LineNr">141 </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="L142" class="LineNr">142 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L143" class="LineNr">143 </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="L144" class="LineNr">144 </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 effective address with <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</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="L145" class="LineNr">145 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L146" class="LineNr">146 </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="L147" class="LineNr">147 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L148" class="LineNr">148 </span><span class="Delimiter">}</span>
-<span id="L149" class="LineNr">149 </span>
-<span id="L150" class="LineNr">150 </span><span class="SalientComment">//:: xor</span>
-<span id="L151" class="LineNr">151 </span>
-<span id="L152" class="LineNr">152 </span><span class="Delimiter">:(scenario xor_r32_with_mem_at_r32)</span>
-<span id="L153" class="LineNr">153 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L154" class="LineNr">154 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0xaabb0c0d);</span>
-<span id="L155" class="LineNr">155 </span><span class="Special">% Reg[3].i = 0xa0b0c0d0;</span>
-<span id="L156" class="LineNr">156 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Constant">31</span>  <span class="Constant">18</span>                                      <span class="Comment"># xor EBX (reg 3) with *EAX (reg 0)</span>
-<span id="L158" class="LineNr">158 </span><span class="traceContains">+run: xor <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
-<span id="L159" class="LineNr">159 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L160" class="LineNr">160 </span><span class="traceContains">+run: storing 0x0a0bccdd</span>
-<span id="L161" class="LineNr">161 </span>
-<span id="L162" class="LineNr">162 </span><span class="Comment">//:</span>
-<span id="L163" class="LineNr">163 </span>
-<span id="L164" class="LineNr">164 </span><span class="Delimiter">:(scenario xor_mem_at_r32_with_r32)</span>
-<span id="L165" class="LineNr">165 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L166" class="LineNr">166 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c0d);</span>
-<span id="L167" class="LineNr">167 </span><span class="Special">% Reg[3].i = 0xa0b0c0d0;</span>
-<span id="L168" class="LineNr">168 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L169" class="LineNr">169 </span>  <span class="Constant">33</span>  <span class="Constant">18</span>                                      <span class="Comment"># xor *EAX (reg 0) with EBX (reg 3)</span>
-<span id="L170" class="LineNr">170 </span><span class="traceContains">+run: xor effective address with <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L171" class="LineNr">171 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L172" class="LineNr">172 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
-<span id="L173" class="LineNr">173 </span>
-<span id="L174" class="LineNr">174 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L175" class="LineNr">175 </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="L176" class="LineNr">176 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L177" class="LineNr">177 </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="L178" class="LineNr">178 </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 effective address with <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</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="L179" class="LineNr">179 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L180" class="LineNr">180 </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="L181" class="LineNr">181 </span>  <span class="Identifier">break</span><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="SalientComment">//:: not</span>
-<span id="L185" class="LineNr">185 </span>
-<span id="L186" class="LineNr">186 </span><span class="Delimiter">:(scenario not_r32_with_mem_at_r32)</span>
-<span id="L187" class="LineNr">187 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L188" class="LineNr">188 </span><span class="Comment"># word at 0x60 is 0x0f0f00ff</span>
-<span id="L189" class="LineNr">189 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0f0f00ff);</span>
-<span id="L190" class="LineNr">190 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L191" class="LineNr">191 </span>  f7  <span class="PreProc">0</span><span class="Constant">3</span>                                      <span class="Comment"># negate *EBX (reg 3)</span>
-<span id="L192" class="LineNr">192 </span><span class="traceContains">+run: 'not' of effective address</span>
-<span id="L193" class="LineNr">193 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
-<span id="L194" class="LineNr">194 </span><span class="traceContains">+run: storing 0xf0f0ff00</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">:(scenario compare_mem_at_r32_with_r32_greater)</span>
-<span id="L199" class="LineNr">199 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L200" class="LineNr">200 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c0d);</span>
-<span id="L201" class="LineNr">201 </span><span class="Special">% Reg[3].i = 0x0a0b0c07;</span>
-<span id="L202" class="LineNr">202 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L203" class="LineNr">203 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX (reg 3) with *EAX (reg 0)</span>
-<span id="L204" class="LineNr">204 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
-<span id="L205" class="LineNr">205 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L206" class="LineNr">206 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L207" class="LineNr">207 </span>
-<span id="L208" class="LineNr">208 </span><span class="Delimiter">:(scenario compare_mem_at_r32_with_r32_lesser)</span>
-<span id="L209" class="LineNr">209 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L210" class="LineNr">210 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c07);</span>
-<span id="L211" class="LineNr">211 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
-<span id="L212" class="LineNr">212 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L213" class="LineNr">213 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX (reg 3) with *EAX (reg 0)</span>
-<span id="L214" class="LineNr">214 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
-<span id="L215" class="LineNr">215 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L216" class="LineNr">216 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</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_equal)</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, 0x0a0b0c0d);</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  ModRM   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 (reg 3) with *EAX (reg 0)</span>
-<span id="L224" class="LineNr">224 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
-<span id="L225" class="LineNr">225 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L226" class="LineNr">226 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L227" class="LineNr">227 </span>
-<span id="L228" class="LineNr">228 </span><span class="Comment">//:</span>
-<span id="L229" class="LineNr">229 </span>
-<span id="L230" class="LineNr">230 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_greater)</span>
-<span id="L231" class="LineNr">231 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L232" class="LineNr">232 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c07);</span>
-<span id="L233" class="LineNr">233 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
-<span id="L234" class="LineNr">234 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L235" class="LineNr">235 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX (reg 0) with EBX (reg 3)</span>
-<span id="L236" class="LineNr">236 </span><span class="traceContains">+run: compare effective address with <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L237" class="LineNr">237 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L238" class="LineNr">238 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</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="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L241" class="LineNr">241 </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="L242" class="LineNr">242 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L243" class="LineNr">243 </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="L244" class="LineNr">244 </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 effective address with <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</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="L245" class="LineNr">245 </span>  <span class="Normal">int32_t</span> arg1 = Reg[reg1]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L246" class="LineNr">246 </span>  <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L247" class="LineNr">247 </span>  <span class="Normal">int32_t</span> tmp1 = arg1 - *arg2<span class="Delimiter">;</span>
-<span id="L248" class="LineNr">248 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L249" class="LineNr">249 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L250" class="LineNr">250 </span>  <span class="Normal">int64_t</span> tmp2 = arg1 - *arg2<span class="Delimiter">;</span>
-<span id="L251" class="LineNr">251 </span>  <a href='010core.cc.html#L33'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<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;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="L253" class="LineNr">253 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L254" class="LineNr">254 </span><span class="Delimiter">}</span>
-<span id="L255" class="LineNr">255 </span>
-<span id="L256" class="LineNr">256 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_lesser)</span>
-<span id="L257" class="LineNr">257 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L258" class="LineNr">258 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c0d);</span>
-<span id="L259" class="LineNr">259 </span><span class="Special">% Reg[3].i = 0x0a0b0c07;</span>
-<span id="L260" class="LineNr">260 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L261" class="LineNr">261 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX (reg 0) with EBX (reg 3)</span>
-<span id="L262" class="LineNr">262 </span><span class="traceContains">+run: compare effective address with <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L263" class="LineNr">263 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L264" class="LineNr">264 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L265" class="LineNr">265 </span>
-<span id="L266" class="LineNr">266 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_equal)</span>
-<span id="L267" class="LineNr">267 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L268" class="LineNr">268 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0a0b0c0d);</span>
-<span id="L269" class="LineNr">269 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
-<span id="L270" class="LineNr">270 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L271" class="LineNr">271 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX (reg 0) with EBX (reg 3)</span>
-<span id="L272" class="LineNr">272 </span><span class="traceContains">+run: compare effective address with <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L273" class="LineNr">273 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L274" class="LineNr">274 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L275" class="LineNr">275 </span>
-<span id="L276" class="LineNr">276 </span><span class="SalientComment">//:: copy (mov)</span>
-<span id="L277" class="LineNr">277 </span>
-<span id="L278" class="LineNr">278 </span><span class="Delimiter">:(scenario copy_r32_to_mem_at_r32)</span>
-<span id="L279" class="LineNr">279 </span><span class="Special">% Reg[3].i = 0xaf;</span>
-<span id="L280" class="LineNr">280 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L281" class="LineNr">281 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L282" class="LineNr">282 </span>  <span class="Constant">89</span>  <span class="Constant">18</span>                                      <span class="Comment"># copy EBX (reg 3) to *EAX (reg 0)</span>
-<span id="L283" class="LineNr">283 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L17'>reg</a> 3 to effective address</span>
-<span id="L284" class="LineNr">284 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L285" class="LineNr">285 </span><span class="traceContains">+run: storing 0x000000af</span>
-<span id="L286" class="LineNr">286 </span>
-<span id="L287" class="LineNr">287 </span><span class="Comment">//:</span>
-<span id="L288" class="LineNr">288 </span>
-<span id="L289" class="LineNr">289 </span><span class="Delimiter">:(scenario copy_mem_at_r32_to_r32)</span>
-<span id="L290" class="LineNr">290 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L291" class="LineNr">291 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x000000af);</span>
-<span id="L292" class="LineNr">292 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L293" class="LineNr">293 </span>  8b  <span class="Constant">18</span>                                      <span class="Comment"># copy *EAX (reg 0) to EBX (reg 3)</span>
-<span id="L294" class="LineNr">294 </span><span class="traceContains">+run: copy effective address to <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L295" class="LineNr">295 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L296" class="LineNr">296 </span><span class="traceContains">+run: storing 0x000000af</span>
-<span id="L297" class="LineNr">297 </span>
-<span id="L298" class="LineNr">298 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L299" class="LineNr">299 </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="L300" class="LineNr">300 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L301" class="LineNr">301 </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="L302" class="LineNr">302 </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 effective address to <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</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="L303" class="LineNr">303 </span>  <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L304" class="LineNr">304 </span>  Reg[reg1]<span class="Delimiter">.</span>i = *arg2<span class="Delimiter">;</span>
-<span id="L305" class="LineNr">305 </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#L230'>HEXWORD</a> &lt;&lt; *arg2 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Identifier">break</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="SalientComment">//:: jump</span>
-<span id="L310" class="LineNr">310 </span>
-<span id="L311" class="LineNr">311 </span><span class="Delimiter">:(scenario jump_mem_at_r32)</span>
-<span id="L312" class="LineNr">312 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L313" class="LineNr">313 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 8);</span>
-<span id="L314" class="LineNr">314 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L315" class="LineNr">315 </span>  ff  <span class="Constant">20</span>                                      <span class="Comment"># jump to *EAX (reg 0)</span>
-<span id="L316" class="LineNr">316 </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="L317" class="LineNr">317 </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="L318" class="LineNr">318 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L319" class="LineNr">319 </span><span class="traceContains">+run: jump to effective address</span>
-<span id="L320" class="LineNr">320 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L321" class="LineNr">321 </span><span class="traceContains">+run: jumping to 0x00000008</span>
-<span id="L322" class="LineNr">322 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L323" class="LineNr">323 </span><span class="traceAbsent">-run: inst: 0x00000003</span>
-<span id="L324" class="LineNr">324 </span>
-<span id="L325" class="LineNr">325 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L326" class="LineNr">326 </span><span class="Normal">case</span> <span class="Constant">0xff</span>: <span class="Delimiter">{</span>
-<span id="L327" class="LineNr">327 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L328" class="LineNr">328 </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="L329" class="LineNr">329 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L330" class="LineNr">330 </span>  <span class="Conceal">¦</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="L331" class="LineNr">331 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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 effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L332" class="LineNr">332 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L333" class="LineNr">333 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> = *arg2<span class="Delimiter">;</span>
-<span id="L334" class="LineNr">334 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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#L230'>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="L335" class="LineNr">335 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L336" class="LineNr">336 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L337" class="LineNr">337 </span>  <span class="Conceal">¦</span> <span class="Comment">// End Op ff Subops</span>
-<span id="L338" class="LineNr">338 </span>  <span class="Delimiter">}</span>
-<span id="L339" class="LineNr">339 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L340" class="LineNr">340 </span><span class="Delimiter">}</span>
-<span id="L341" class="LineNr">341 </span>
-<span id="L342" class="LineNr">342 </span><span class="SalientComment">//:: push</span>
-<span id="L343" class="LineNr">343 </span>
-<span id="L344" class="LineNr">344 </span><span class="Delimiter">:(scenario push_mem_at_r32)</span>
-<span id="L345" class="LineNr">345 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L346" class="LineNr">346 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x000000af);</span>
-<span id="L347" class="LineNr">347 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
-<span id="L348" class="LineNr">348 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L349" class="LineNr">349 </span>  ff  <span class="Constant">30</span>                                      <span class="Comment"># push *EAX (reg 0) to stack</span>
-<span id="L350" class="LineNr">350 </span><span class="traceContains">+run: <a href='011direct_addressing.cc.html#L244'>push</a> effective address</span>
-<span id="L351" class="LineNr">351 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L352" class="LineNr">352 </span><span class="traceContains">+run: decrementing <a href='010core.cc.html#L11'>ESP</a> to 0x00000010</span>
-<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: pushing value 0x000000af</span>
-<span id="L354" class="LineNr">354 </span>
-<span id="L355" class="LineNr">355 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
-<span id="L356" class="LineNr">356 </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="L357" class="LineNr">357 </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 effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L358" class="LineNr">358 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* val = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L359" class="LineNr">359 </span>  <a href='011direct_addressing.cc.html#L244'>push</a><span class="Delimiter">(</span>*val<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>
-<span id="L363" class="LineNr">363 </span><span class="SalientComment">//:: pop</span>
-<span id="L364" class="LineNr">364 </span>
-<span id="L365" class="LineNr">365 </span><span class="Delimiter">:(scenario pop_mem_at_r32)</span>
-<span id="L366" class="LineNr">366 </span><span class="Special">% Reg[0].i = 0x60;</span>
-<span id="L367" class="LineNr">367 </span><span class="Special">% Reg[ESP].u = 0x10;</span>
-<span id="L368" class="LineNr">368 </span><span class="Special">% SET_WORD_IN_MEM(0x10, 0x00000030);</span>
-<span id="L369" class="LineNr">369 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L370" class="LineNr">370 </span>  <span class="Constant">8f</span>  <span class="PreProc">0</span><span class="Constant">0</span>                                      <span class="Comment"># pop stack into *EAX (reg 0)</span>
-<span id="L371" class="LineNr">371 </span><span class="traceContains">+run: <a href='011direct_addressing.cc.html#L277'>pop</a> into effective address</span>
-<span id="L372" class="LineNr">372 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
-<span id="L373" class="LineNr">373 </span><span class="traceContains">+run: popping value 0x00000030</span>
-<span id="L374" class="LineNr">374 </span><span class="traceContains">+run: incrementing <a href='010core.cc.html#L11'>ESP</a> to 0x00000014</span>
-<span id="L375" class="LineNr">375 </span>
-<span id="L376" class="LineNr">376 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L377" class="LineNr">377 </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="L378" class="LineNr">378 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L379" class="LineNr">379 </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="L380" class="LineNr">380 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L381" class="LineNr">381 </span>  <span class="Conceal">¦</span> <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>
-<span id="L382" class="LineNr">382 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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 effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L383" class="LineNr">383 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">int32_t</span>* dest = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L384" class="LineNr">384 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> *dest = <a href='011direct_addressing.cc.html#L277'>pop</a><span class="Delimiter">();</span>
-<span id="L385" class="LineNr">385 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L386" class="LineNr">386 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L387" class="LineNr">387 </span>  <span class="Delimiter">}</span>
-<span id="L388" class="LineNr">388 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L389" class="LineNr">389 </span><span class="Delimiter">}</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>
diff --git a/html/subx/013immediate_addressing.cc.html b/html/subx/013immediate_addressing.cc.html
index d08b09af..b998bb3f 100644
--- a/html/subx/013immediate_addressing.cc.html
+++ b/html/subx/013immediate_addressing.cc.html
@@ -15,19 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Conceal { color: #4e4e4e; }
-.traceContains { color: #008000; }
+.cSpecial { color: #008000; }
 .PreProc { color: #800080; }
 .LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .SalientComment { color: #00ffff; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
-.Constant { color: #00a0a0; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.Special { color: #c00000; }
-.cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 -->
 </style>
 
@@ -66,394 +65,411 @@ if ('onhashchange' in window) {
 <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  ModRM   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 (reg 3)</span>
-<span id="L7" class="LineNr">  7 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L8" class="LineNr">  8 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L9" class="LineNr">  9 </span><span class="traceContains">+run: subop add</span>
-<span id="L10" class="LineNr"> 10 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span>
-<span id="L11" class="LineNr"> 11 </span>
-<span id="L12" class="LineNr"> 12 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L13" class="LineNr"> 13 </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="L14" class="LineNr"> 14 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L15" class="LineNr"> 15 </span>  <span class="Normal">int32_t</span> arg2 = <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;combine <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L17" class="LineNr"> 17 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L18" class="LineNr"> 18 </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="L19" class="LineNr"> 19 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L20" class="LineNr"> 20 </span>  <span class="Normal">case</span> <span class="Constant">0</span>:
-<span id="L21" class="LineNr"> 21 </span>  <span class="Conceal">¦</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="L22" class="LineNr"> 22 </span>  <span class="Conceal">¦</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="L23" class="LineNr"> 23 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Comment">// End Op 81 Subops</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Normal">default</span>:
-<span id="L26" class="LineNr"> 26 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after 81: &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L27" class="LineNr"> 27 </span>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</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>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L30" class="LineNr"> 30 </span><span class="Delimiter">}</span>
-<span id="L31" class="LineNr"> 31 </span>
-<span id="L32" class="LineNr"> 32 </span><span class="Comment">//:</span>
-<span id="L33" class="LineNr"> 33 </span>
-<span id="L34" class="LineNr"> 34 </span><span class="Delimiter">:(scenario add_imm32_to_mem_at_r32)</span>
-<span id="L35" class="LineNr"> 35 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L36" class="LineNr"> 36 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
-<span id="L37" class="LineNr"> 37 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L38" class="LineNr"> 38 </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 (reg 3)</span>
-<span id="L39" class="LineNr"> 39 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L40" class="LineNr"> 40 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
-<span id="L41" class="LineNr"> 41 </span><span class="traceContains">+run: subop add</span>
-<span id="L42" class="LineNr"> 42 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span>
-<span id="L43" class="LineNr"> 43 </span>
-<span id="L44" class="LineNr"> 44 </span><span class="SalientComment">//:: subtract</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="Delimiter">:(scenario subtract_imm32_from_eax)</span>
-<span id="L47" class="LineNr"> 47 </span><span class="Special">% Reg[EAX].i = 0x0d0c0baa;</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>  2d                              0a 0b 0c 0d  <span class="Comment"># subtract 0x0d0c0b0a from EAX (reg 0)</span>
-<span id="L50" class="LineNr"> 50 </span><span class="traceContains">+run: subtract <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a from <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L51" class="LineNr"> 51 </span><span class="traceContains">+run: storing 0x000000a0</span>
-<span id="L52" class="LineNr"> 52 </span>
-<span id="L53" class="LineNr"> 53 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L54" class="LineNr"> 54 </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="L55" class="LineNr"> 55 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L56" class="LineNr"> 56 </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#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from <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="L57" class="LineNr"> 57 </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="L58" class="LineNr"> 58 </span>  <span class="Identifier">break</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="Comment">//:</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="Delimiter">:(scenario subtract_imm32_from_mem_at_r32)</span>
-<span id="L64" class="LineNr"> 64 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L65" class="LineNr"> 65 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 10);</span>
-<span id="L66" class="LineNr"> 66 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L67" class="LineNr"> 67 </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 (reg 3)</span>
-<span id="L68" class="LineNr"> 68 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x00000001 with effective address</span>
-<span id="L69" class="LineNr"> 69 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
-<span id="L70" class="LineNr"> 70 </span><span class="traceContains">+run: subop subtract</span>
-<span id="L71" class="LineNr"> 71 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L72" class="LineNr"> 72 </span>
-<span id="L73" class="LineNr"> 73 </span><span class="Comment">//:</span>
-<span id="L74" class="LineNr"> 74 </span>
-<span id="L75" class="LineNr"> 75 </span><span class="Delimiter">:(scenario subtract_imm32_from_r32)</span>
-<span id="L76" class="LineNr"> 76 </span><span class="Special">% Reg[3].i = 10;</span>
-<span id="L77" class="LineNr"> 77 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L78" class="LineNr"> 78 </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 (reg 3)</span>
-<span id="L79" class="LineNr"> 79 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x00000001 with effective address</span>
-<span id="L80" class="LineNr"> 80 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L81" class="LineNr"> 81 </span><span class="traceContains">+run: subop subtract</span>
-<span id="L82" class="LineNr"> 82 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L83" class="LineNr"> 83 </span>
-<span id="L84" class="LineNr"> 84 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L85" class="LineNr"> 85 </span><span class="Normal">case</span> <span class="Constant">5</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;subop subtract&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L87" class="LineNr"> 87 </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="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="L90" class="LineNr"> 90 </span>
-<span id="L91" class="LineNr"> 91 </span><span class="SalientComment">//:: and</span>
-<span id="L92" class="LineNr"> 92 </span>
-<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(scenario and_imm32_with_eax)</span>
-<span id="L94" class="LineNr"> 94 </span><span class="Special">% Reg[EAX].i = 0xff;</span>
-<span id="L95" class="LineNr"> 95 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Constant">25</span>                              0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EAX (reg 0)</span>
-<span id="L97" class="LineNr"> 97 </span><span class="traceContains">+run: and <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L98" class="LineNr"> 98 </span><span class="traceContains">+run: storing 0x0000000a</span>
-<span id="L99" class="LineNr"> 99 </span>
-<span id="L100" class="LineNr">100 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L101" class="LineNr">101 </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="L102" class="LineNr">102 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L103" class="LineNr">103 </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#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with <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="L104" class="LineNr">104 </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="L105" class="LineNr">105 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L106" class="LineNr">106 </span><span class="Delimiter">}</span>
-<span id="L107" class="LineNr">107 </span>
-<span id="L108" class="LineNr">108 </span><span class="Comment">//:</span>
-<span id="L109" class="LineNr">109 </span>
-<span id="L110" class="LineNr">110 </span><span class="Delimiter">:(scenario and_imm32_with_mem_at_r32)</span>
-<span id="L111" class="LineNr">111 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L112" class="LineNr">112 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x000000ff);</span>
-<span id="L113" class="LineNr">113 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Constant">81</span>  <span class="Constant">23</span>                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with *EBX (reg 3)</span>
-<span id="L115" class="LineNr">115 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L116" class="LineNr">116 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
-<span id="L117" class="LineNr">117 </span><span class="traceContains">+run: subop and</span>
-<span id="L118" class="LineNr">118 </span><span class="traceContains">+run: storing 0x0000000a</span>
-<span id="L119" class="LineNr">119 </span>
-<span id="L120" class="LineNr">120 </span><span class="Comment">//:</span>
-<span id="L121" class="LineNr">121 </span>
-<span id="L122" class="LineNr">122 </span><span class="Delimiter">:(scenario and_imm32_with_r32)</span>
-<span id="L123" class="LineNr">123 </span><span class="Special">% Reg[3].i = 0xff;</span>
-<span id="L124" class="LineNr">124 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L125" class="LineNr">125 </span>  <span class="Constant">81</span>  e3                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EBX (reg 3)</span>
-<span id="L126" class="LineNr">126 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L127" class="LineNr">127 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L128" class="LineNr">128 </span><span class="traceContains">+run: subop and</span>
-<span id="L129" class="LineNr">129 </span><span class="traceContains">+run: storing 0x0000000a</span>
-<span id="L130" class="LineNr">130 </span>
-<span id="L131" class="LineNr">131 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L132" class="LineNr">132 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>
-<span id="L133" class="LineNr">133 </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="L134" class="LineNr">134 </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="L135" class="LineNr">135 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L136" class="LineNr">136 </span><span class="Delimiter">}</span>
-<span id="L137" class="LineNr">137 </span>
-<span id="L138" class="LineNr">138 </span><span class="SalientComment">//:: or</span>
-<span id="L139" class="LineNr">139 </span>
-<span id="L140" class="LineNr">140 </span><span class="Delimiter">:(scenario or_imm32_with_eax)</span>
-<span id="L141" class="LineNr">141 </span><span class="Special">% Reg[EAX].i = 0xd0c0b0a0;</span>
-<span id="L142" class="LineNr">142 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L143" class="LineNr">143 </span>  0d                              0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EAX (reg 0)</span>
-<span id="L144" class="LineNr">144 </span><span class="traceContains">+run: or <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L145" class="LineNr">145 </span><span class="traceContains">+run: storing 0xddccbbaa</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">0x0d</span>: <span class="Delimiter">{</span>  <span class="Comment">// or imm32 with EAX</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</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;or <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with <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="L151" class="LineNr">151 </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="L152" class="LineNr">152 </span>  <span class="Identifier">break</span><span class="Delimiter">;</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="Comment">//:</span>
-<span id="L156" class="LineNr">156 </span>
-<span id="L157" class="LineNr">157 </span><span class="Delimiter">:(scenario or_imm32_with_mem_at_r32)</span>
-<span id="L158" class="LineNr">158 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L159" class="LineNr">159 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0xd0c0b0a0);</span>
-<span id="L160" class="LineNr">160 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L161" class="LineNr">161 </span>  <span class="Constant">81</span>  0b                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with *EBX (reg 3)</span>
-<span id="L162" class="LineNr">162 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L163" class="LineNr">163 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
-<span id="L164" class="LineNr">164 </span><span class="traceContains">+run: subop or</span>
-<span id="L165" class="LineNr">165 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L166" class="LineNr">166 </span>
-<span id="L167" class="LineNr">167 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L168" class="LineNr">168 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>
-<span id="L169" class="LineNr">169 </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="L170" class="LineNr">170 </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="L171" class="LineNr">171 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L172" class="LineNr">172 </span><span class="Delimiter">}</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">:(scenario or_imm32_with_r32)</span>
-<span id="L175" class="LineNr">175 </span><span class="Special">% Reg[3].i = 0xd0c0b0a0;</span>
-<span id="L176" class="LineNr">176 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L177" class="LineNr">177 </span>  <span class="Constant">81</span>  cb                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EBX (reg 3)</span>
-<span id="L178" class="LineNr">178 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L179" class="LineNr">179 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L180" class="LineNr">180 </span><span class="traceContains">+run: subop or</span>
-<span id="L181" class="LineNr">181 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L182" class="LineNr">182 </span>
-<span id="L183" class="LineNr">183 </span><span class="SalientComment">//:: xor</span>
-<span id="L184" class="LineNr">184 </span>
-<span id="L185" class="LineNr">185 </span><span class="Delimiter">:(scenario xor_imm32_with_eax)</span>
-<span id="L186" class="LineNr">186 </span><span class="Special">% Reg[EAX].i = 0xddccb0a0;</span>
-<span id="L187" class="LineNr">187 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L188" class="LineNr">188 </span>  <span class="Constant">35</span>                              0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EAX (reg 0)</span>
-<span id="L189" class="LineNr">189 </span><span class="traceContains">+run: xor <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a></span>
-<span id="L190" class="LineNr">190 </span><span class="traceContains">+run: storing 0xd0c0bbaa</span>
-<span id="L191" class="LineNr">191 </span>
-<span id="L192" class="LineNr">192 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L193" class="LineNr">193 </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="L194" class="LineNr">194 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L195" class="LineNr">195 </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#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with <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="L196" class="LineNr">196 </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="L197" class="LineNr">197 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L198" class="LineNr">198 </span><span class="Delimiter">}</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="Comment">//:</span>
-<span id="L201" class="LineNr">201 </span>
-<span id="L202" class="LineNr">202 </span><span class="Delimiter">:(scenario xor_imm32_with_mem_at_r32)</span>
-<span id="L203" class="LineNr">203 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L204" class="LineNr">204 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0xd0c0b0a0);</span>
-<span id="L205" class="LineNr">205 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L206" class="LineNr">206 </span>  <span class="Constant">81</span>  <span class="Constant">33</span>                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with *EBX (reg 3)</span>
-<span id="L207" class="LineNr">207 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L208" class="LineNr">208 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
-<span id="L209" class="LineNr">209 </span><span class="traceContains">+run: subop xor</span>
-<span id="L210" class="LineNr">210 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L211" class="LineNr">211 </span>
-<span id="L212" class="LineNr">212 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L213" class="LineNr">213 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>
-<span id="L214" class="LineNr">214 </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="L215" class="LineNr">215 </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="L216" class="LineNr">216 </span>  <span class="Identifier">break</span><span class="Delimiter">;</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">:(scenario xor_imm32_with_r32)</span>
-<span id="L220" class="LineNr">220 </span><span class="Special">% Reg[3].i = 0xd0c0b0a0;</span>
-<span id="L221" class="LineNr">221 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Constant">81</span>  f3                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EBX (reg 3)</span>
-<span id="L223" class="LineNr">223 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L224" class="LineNr">224 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L225" class="LineNr">225 </span><span class="traceContains">+run: subop xor</span>
-<span id="L226" class="LineNr">226 </span><span class="traceContains">+run: storing 0xddccbbaa</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="SalientComment">//:: compare (cmp)</span>
-<span id="L229" class="LineNr">229 </span>
-<span id="L230" class="LineNr">230 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_greater)</span>
-<span id="L231" class="LineNr">231 </span><span class="Special">% Reg[0].i = 0x0d0c0b0a;</span>
-<span id="L232" class="LineNr">232 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L233" class="LineNr">233 </span>  3d                              <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with EAX (reg 0)</span>
-<span id="L234" class="LineNr">234 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a> and <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b07</span>
-<span id="L235" class="LineNr">235 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L236" class="LineNr">236 </span>
-<span id="L237" class="LineNr">237 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L238" class="LineNr">238 </span><span class="Normal">case</span> <span class="Constant">0x3d</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract imm32 from EAX</span>
-<span id="L239" class="LineNr">239 </span>  <span class="Normal">int32_t</span> arg1 = Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L240" class="LineNr">240 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L241" class="LineNr">241 </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#L17'>reg</a> <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#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L242" class="LineNr">242 </span>  <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span>
-<span id="L243" class="LineNr">243 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L244" class="LineNr">244 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L245" class="LineNr">245 </span>  <span class="Normal">int64_t</span> tmp2 = arg1 - arg2<span class="Delimiter">;</span>
-<span id="L246" class="LineNr">246 </span>  <a href='010core.cc.html#L33'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<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;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="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>
-<span id="L250" class="LineNr">250 </span>
-<span id="L251" class="LineNr">251 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_lesser)</span>
-<span id="L252" class="LineNr">252 </span><span class="Special">% Reg[0].i = 0x0d0c0b07;</span>
-<span id="L253" class="LineNr">253 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L254" class="LineNr">254 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX (reg 0)</span>
-<span id="L255" class="LineNr">255 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a> and <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a</span>
-<span id="L256" class="LineNr">256 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L257" class="LineNr">257 </span>
-<span id="L258" class="LineNr">258 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_equal)</span>
-<span id="L259" class="LineNr">259 </span><span class="Special">% Reg[0].i = 0x0d0c0b0a;</span>
-<span id="L260" class="LineNr">260 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L261" class="LineNr">261 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX (reg 0)</span>
-<span id="L262" class="LineNr">262 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a> and <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a</span>
-<span id="L263" class="LineNr">263 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L264" class="LineNr">264 </span>
-<span id="L265" class="LineNr">265 </span><span class="Comment">//:</span>
-<span id="L266" class="LineNr">266 </span>
-<span id="L267" class="LineNr">267 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_greater)</span>
-<span id="L268" class="LineNr">268 </span><span class="Special">% Reg[3].i = 0x0d0c0b0a;</span>
-<span id="L269" class="LineNr">269 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L270" class="LineNr">270 </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 (reg 3)</span>
-<span id="L271" class="LineNr">271 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b07 with effective address</span>
-<span id="L272" class="LineNr">272 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L273" class="LineNr">273 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</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="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L276" class="LineNr">276 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>
-<span id="L277" class="LineNr">277 </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="L278" class="LineNr">278 </span>  <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L279" class="LineNr">279 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L280" class="LineNr">280 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L281" class="LineNr">281 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L282" class="LineNr">282 </span>  <a href='010core.cc.html#L33'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L283" class="LineNr">283 </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="L284" class="LineNr">284 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L285" class="LineNr">285 </span><span class="Delimiter">}</span>
-<span id="L286" class="LineNr">286 </span>
-<span id="L287" class="LineNr">287 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_lesser)</span>
-<span id="L288" class="LineNr">288 </span><span class="Special">% Reg[3].i = 0x0d0c0b07;</span>
-<span id="L289" class="LineNr">289 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L290" class="LineNr">290 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX (reg 3)</span>
-<span id="L291" class="LineNr">291 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L292" class="LineNr">292 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L293" class="LineNr">293 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L294" class="LineNr">294 </span>
-<span id="L295" class="LineNr">295 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_equal)</span>
-<span id="L296" class="LineNr">296 </span><span class="Special">% Reg[3].i = 0x0d0c0b0a;</span>
-<span id="L297" class="LineNr">297 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX (reg 3)</span>
-<span id="L299" class="LineNr">299 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L300" class="LineNr">300 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L301" class="LineNr">301 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L302" class="LineNr">302 </span>
-<span id="L303" class="LineNr">303 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_greater)</span>
-<span id="L304" class="LineNr">304 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L305" class="LineNr">305 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0d0c0b0a);</span>
-<span id="L306" class="LineNr">306 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L307" class="LineNr">307 </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 (reg 3)</span>
-<span id="L308" class="LineNr">308 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b07 with effective address</span>
-<span id="L309" class="LineNr">309 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
-<span id="L310" class="LineNr">310 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L311" class="LineNr">311 </span>
-<span id="L312" class="LineNr">312 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_lesser)</span>
-<span id="L313" class="LineNr">313 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L314" class="LineNr">314 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0d0c0b07);</span>
-<span id="L315" class="LineNr">315 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L316" class="LineNr">316 </span>  <span class="Constant">81</span>  3b                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with *EBX (reg 3)</span>
-<span id="L317" class="LineNr">317 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L318" class="LineNr">318 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
-<span id="L319" class="LineNr">319 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L320" class="LineNr">320 </span>
-<span id="L321" class="LineNr">321 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_equal)</span>
-<span id="L322" class="LineNr">322 </span><span class="Special">% Reg[3].i = 0x0d0c0b0a;</span>
-<span id="L323" class="LineNr">323 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L324" class="LineNr">324 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0d0c0b0a);</span>
-<span id="L325" class="LineNr">325 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L326" class="LineNr">326 </span>  <span class="Constant">81</span>  3b                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with *EBX (reg 3)</span>
-<span id="L327" class="LineNr">327 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L328" class="LineNr">328 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
-<span id="L329" class="LineNr">329 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L330" class="LineNr">330 </span>
-<span id="L331" class="LineNr">331 </span><span class="SalientComment">//:: copy (mov)</span>
-<span id="L332" class="LineNr">332 </span>
-<span id="L333" class="LineNr">333 </span><span class="Delimiter">:(scenario copy_imm32_to_r32)</span>
-<span id="L334" class="LineNr">334 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L335" class="LineNr">335 </span>  bb                              0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to EBX (reg 3)</span>
-<span id="L336" class="LineNr">336 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a to <a href='010core.cc.html#L17'>reg</a> 3</span>
-<span id="L337" class="LineNr">337 </span>
-<span id="L338" class="LineNr">338 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L339" class="LineNr">339 </span><span class="Normal">case</span> <span class="Constant">0xb8</span>:
-<span id="L340" class="LineNr">340 </span><span class="Normal">case</span> <span class="Constant">0xb9</span>:
-<span id="L341" class="LineNr">341 </span><span class="Normal">case</span> <span class="Constant">0xba</span>:
-<span id="L342" class="LineNr">342 </span><span class="Normal">case</span> <span class="Constant">0xbb</span>:
-<span id="L343" class="LineNr">343 </span><span class="Normal">case</span> <span class="Constant">0xbc</span>:
-<span id="L344" class="LineNr">344 </span><span class="Normal">case</span> <span class="Constant">0xbd</span>:
-<span id="L345" class="LineNr">345 </span><span class="Normal">case</span> <span class="Constant">0xbe</span>:
-<span id="L346" class="LineNr">346 </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="L347" class="LineNr">347 </span>  <span class="Normal">uint8_t</span> reg1 = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L348" class="LineNr">348 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</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;copy <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</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="L350" class="LineNr">350 </span>  Reg[reg1]<span class="Delimiter">.</span>i = arg2<span class="Delimiter">;</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L352" class="LineNr">352 </span><span class="Delimiter">}</span>
+<span id="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="Comment">//:</span>
-<span id="L355" class="LineNr">355 </span>
-<span id="L356" class="LineNr">356 </span><span class="Delimiter">:(scenario copy_imm32_to_mem_at_r32)</span>
-<span id="L357" class="LineNr">357 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L358" class="LineNr">358 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L359" class="LineNr">359 </span>  c7  <span class="PreProc">0</span><span class="Constant">3</span>                          0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to *EBX (reg 3)</span>
-<span id="L360" class="LineNr">360 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a to effective address</span>
-<span id="L361" class="LineNr">361 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
-<span id="L362" class="LineNr">362 </span>
-<span id="L363" class="LineNr">363 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L364" class="LineNr">364 </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="L365" class="LineNr">365 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L366" class="LineNr">366 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L367" class="LineNr">367 </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#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L368" class="LineNr">368 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L369" class="LineNr">369 </span>  *arg1 = arg2<span class="Delimiter">;</span>
-<span id="L370" class="LineNr">370 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L371" class="LineNr">371 </span><span class="Delimiter">}</span>
-<span id="L372" class="LineNr">372 </span>
-<span id="L373" class="LineNr">373 </span><span class="SalientComment">//:: push</span>
-<span id="L374" class="LineNr">374 </span>
-<span id="L375" class="LineNr">375 </span><span class="Delimiter">:(scenario push_imm32)</span>
-<span id="L376" class="LineNr">376 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
-<span id="L377" class="LineNr">377 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L378" class="LineNr">378 </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 (reg 0) to stack</span>
-<span id="L379" class="LineNr">379 </span><span class="traceContains">+run: <a href='011direct_addressing.cc.html#L244'>push</a> <a href='010core.cc.html#L219'>imm32</a> 0x000000af</span>
-<span id="L380" class="LineNr">380 </span><span class="traceContains">+run: <a href='010core.cc.html#L11'>ESP</a> is now 0x00000010</span>
-<span id="L381" class="LineNr">381 </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="L382" class="LineNr">382 </span>
-<span id="L383" class="LineNr">383 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L384" class="LineNr">384 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span>
-<span id="L385" class="LineNr">385 </span>  <span class="Normal">int32_t</span> val = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L386" class="LineNr">386 </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#L230'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L387" class="LineNr">387 </span>  Reg[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L388" class="LineNr">388 </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="L389" class="LineNr">389 </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#L230'>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="L390" class="LineNr">390 </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#L230'>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="L391" class="LineNr">391 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L392" class="LineNr">392 </span><span class="Delimiter">}</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>
diff --git a/html/subx/014index_addressing.cc.html b/html/subx/014index_addressing.cc.html
new file mode 100644
index 00000000..88ce0614
--- /dev/null
+++ b/html/subx/014index_addressing.cc.html
@@ -0,0 +1,181 @@
+<!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/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="cpp">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<style type="text/css">
+<!--
+pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+a { color:#eeeeee; text-decoration: none; }
+a:hover { text-decoration: underline; }
+* { font-size: 12pt; font-size: 1em; }
+.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.PreProc { color: #800080; }
+-->
+</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/014jump_relative.cc.html b/html/subx/014jump_relative.cc.html
deleted file mode 100644
index 6373952c..00000000
--- a/html/subx/014jump_relative.cc.html
+++ /dev/null
@@ -1,320 +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/014jump_relative.cc</title>
-<meta name="Generator" content="Vim/8.0">
-<meta name="plugin-version" content="vim7.4_v2">
-<meta name="syntax" content="cpp">
-<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
-<style type="text/css">
-<!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-a { color:#eeeeee; text-decoration: none; }
-a:hover { text-decoration: underline; }
-* { font-size: 12pt; font-size: 1em; }
-.Conceal { color: #4e4e4e; }
-.traceContains { color: #008000; }
-.PreProc { color: #800080; }
-.LineNr { color: #444444; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Identifier { color: #c0a020; }
-.Delimiter { color: #800080; }
-.Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
-.traceAbsent { color: #c00000; }
-.Special { 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  ModRM   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#L232'>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  ModRM   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>  <span class="Conceal">¦</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#L232'>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>  <span class="Conceal">¦</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  ModRM   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  ModRM   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>  <span class="Conceal">¦</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#L232'>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>  <span class="Conceal">¦</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  ModRM   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  ModRM   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>  <span class="Conceal">¦</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#L232'>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>  <span class="Conceal">¦</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  ModRM   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  ModRM   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>  <span class="Conceal">¦</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#L232'>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>  <span class="Conceal">¦</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  ModRM   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  ModRM   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>  <span class="Conceal">¦</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#L232'>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>  <span class="Conceal">¦</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  ModRM   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  ModRM   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  ModRM   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>  <span class="Conceal">¦</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#L232'>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>  <span class="Conceal">¦</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  ModRM   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/015jump_relative.cc.html b/html/subx/015jump_relative.cc.html
index 601f1755..3517af1b 100644
--- a/html/subx/015jump_relative.cc.html
+++ b/html/subx/015jump_relative.cc.html
@@ -15,19 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Conceal { color: #4e4e4e; }
+.traceAbsent { color: #c00000; }
 .traceContains { color: #008000; }
 .PreProc { color: #800080; }
 .LineNr { color: #444444; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Identifier { color: #c0a020; }
-.Delimiter { color: #800080; }
 .Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .SalientComment { color: #00ffff; }
-.traceAbsent { color: #c00000; }
-.Special { color: #c00000; }
 -->
 </style>
 
@@ -62,264 +61,258 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="Comment">//: jump to 16-bit offset</span>
+<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_rel16)</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L7" class="LineNr">  7 </span>  e9                <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</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: 0x00000009</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">0xe9</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8</span>
-<span id="L17" class="LineNr"> 17 </span>  <span class="Normal">int16_t</span> offset = <a href='015jump_relative.cc.html#L23'>imm16</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; offset &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</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 class="Delimiter">:(code)</span>
-<span id="L23" class="LineNr"> 23 </span><span class="Normal">int16_t</span> <a href='015jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Normal">int16_t</span> result = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L25" class="LineNr"> 25 </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="L26" class="LineNr"> 26 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L27" class="LineNr"> 27 </span><span class="Delimiter">}</span>
-<span id="L28" class="LineNr"> 28 </span>
-<span id="L29" class="LineNr"> 29 </span><span class="SalientComment">//:: jump if equal/zero</span>
-<span id="L30" class="LineNr"> 30 </span>
-<span id="L31" class="LineNr"> 31 </span><span class="Delimiter">:(scenario je_rel16_success)</span>
-<span id="L32" class="LineNr"> 32 </span><span class="Special">% ZF = true;</span>
-<span id="L33" class="LineNr"> 33 </span><span class="Comment"># op      ModRM   SIB   displacement  immediate</span>
-<span id="L34" class="LineNr"> 34 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
-<span id="L35" class="LineNr"> 35 </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="L36" class="LineNr"> 36 </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="L37" class="LineNr"> 37 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L38" class="LineNr"> 38 </span><span class="traceContains">+run: jump 5</span>
-<span id="L39" class="LineNr"> 39 </span><span class="traceContains">+run: inst: 0x0000000a</span>
-<span id="L40" class="LineNr"> 40 </span><span class="traceAbsent">-run: inst: 0x00000005</span>
-<span id="L41" class="LineNr"> 41 </span>
-<span id="L42" class="LineNr"> 42 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
-<span id="L43" class="LineNr"> 43 </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="L44" class="LineNr"> 44 </span>  <span class="Normal">int8_t</span> offset = <a href='015jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
-<span id="L45" class="LineNr"> 45 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L46" class="LineNr"> 46 </span>  <span class="Conceal">¦</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#L232'>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="L47" class="LineNr"> 47 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L48" class="LineNr"> 48 </span>  <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 je_rel16_fail)</span>
-<span id="L53" class="LineNr"> 53 </span><span class="Special">% ZF = false;</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Comment"># op      ModRM   SIB   displacement  immediate</span>
-<span id="L55" class="LineNr"> 55 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
-<span id="L56" class="LineNr"> 56 </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="L57" class="LineNr"> 57 </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="L58" class="LineNr"> 58 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L59" class="LineNr"> 59 </span><span class="traceContains">+run: inst: 0x00000005</span>
-<span id="L60" class="LineNr"> 60 </span><span class="traceContains">+run: inst: 0x0000000a</span>
-<span id="L61" class="LineNr"> 61 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L62" class="LineNr"> 62 </span>
-<span id="L63" class="LineNr"> 63 </span><span class="SalientComment">//:: jump if not equal/not zero</span>
-<span id="L64" class="LineNr"> 64 </span>
-<span id="L65" class="LineNr"> 65 </span><span class="Delimiter">:(scenario jne_rel16_success)</span>
-<span id="L66" class="LineNr"> 66 </span><span class="Special">% ZF = false;</span>
-<span id="L67" class="LineNr"> 67 </span><span class="Comment"># op      ModRM   SIB   displacement  immediate</span>
-<span id="L68" class="LineNr"> 68 </span>  <span class="Constant">0f</span> <span class="Constant">85</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
-<span id="L69" class="LineNr"> 69 </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="L70" class="LineNr"> 70 </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="L71" class="LineNr"> 71 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L72" class="LineNr"> 72 </span><span class="traceContains">+run: jump 5</span>
-<span id="L73" class="LineNr"> 73 </span><span class="traceContains">+run: inst: 0x0000000a</span>
-<span id="L74" class="LineNr"> 74 </span><span class="traceAbsent">-run: inst: 0x00000005</span>
-<span id="L75" class="LineNr"> 75 </span>
-<span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
-<span id="L77" class="LineNr"> 77 </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="L78" class="LineNr"> 78 </span>  <span class="Normal">int8_t</span> offset = <a href='015jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
-<span id="L79" class="LineNr"> 79 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Conceal">¦</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#L232'>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="L81" class="LineNr"> 81 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L82" class="LineNr"> 82 </span>  <span class="Delimiter">}</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L84" class="LineNr"> 84 </span><span class="Delimiter">}</span>
-<span id="L85" class="LineNr"> 85 </span>
-<span id="L86" class="LineNr"> 86 </span><span class="Delimiter">:(scenario jne_rel16_fail)</span>
-<span id="L87" class="LineNr"> 87 </span><span class="Special">% ZF = true;</span>
-<span id="L88" class="LineNr"> 88 </span><span class="Comment"># op      ModRM   SIB   displacement  immediate</span>
-<span id="L89" class="LineNr"> 89 </span>  <span class="Constant">0f</span> <span class="Constant">85</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
-<span id="L90" class="LineNr"> 90 </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="L91" class="LineNr"> 91 </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="L92" class="LineNr"> 92 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L93" class="LineNr"> 93 </span><span class="traceContains">+run: inst: 0x00000005</span>
-<span id="L94" class="LineNr"> 94 </span><span class="traceContains">+run: inst: 0x0000000a</span>
-<span id="L95" class="LineNr"> 95 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L96" class="LineNr"> 96 </span>
-<span id="L97" class="LineNr"> 97 </span><span class="SalientComment">//:: jump if greater</span>
-<span id="L98" class="LineNr"> 98 </span>
-<span id="L99" class="LineNr"> 99 </span><span class="Delimiter">:(scenario jg_rel16_success)</span>
-<span id="L100" class="LineNr">100 </span><span class="Special">% ZF = false;</span>
-<span id="L101" class="LineNr">101 </span><span class="Special">% SF = false;</span>
-<span id="L102" class="LineNr">102 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L103" class="LineNr">103 </span><span class="Comment"># op      ModRM   SIB   displacement  immediate</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Constant">0f</span> <span class="Constant">8f</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
-<span id="L105" class="LineNr">105 </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="L106" class="LineNr">106 </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="L107" class="LineNr">107 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L108" class="LineNr">108 </span><span class="traceContains">+run: jump 5</span>
-<span id="L109" class="LineNr">109 </span><span class="traceContains">+run: inst: 0x0000000a</span>
-<span id="L110" class="LineNr">110 </span><span class="traceAbsent">-run: inst: 0x00000005</span>
-<span id="L111" class="LineNr">111 </span>
-<span id="L112" class="LineNr">112 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
-<span id="L113" class="LineNr">113 </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="L114" class="LineNr">114 </span>  <span class="Normal">int8_t</span> offset = <a href='015jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
-<span id="L115" class="LineNr">115 </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="L116" class="LineNr">116 </span>  <span class="Conceal">¦</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#L232'>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="L117" class="LineNr">117 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L118" class="LineNr">118 </span>  <span class="Delimiter">}</span>
-<span id="L119" class="LineNr">119 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L120" class="LineNr">120 </span><span class="Delimiter">}</span>
-<span id="L121" class="LineNr">121 </span>
-<span id="L122" class="LineNr">122 </span><span class="Delimiter">:(scenario jg_rel16_fail)</span>
-<span id="L123" class="LineNr">123 </span><span class="Special">% ZF = false;</span>
-<span id="L124" class="LineNr">124 </span><span class="Special">% SF = true;</span>
-<span id="L125" class="LineNr">125 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L126" class="LineNr">126 </span><span class="Comment"># op      ModRM   SIB   displacement  immediate</span>
-<span id="L127" class="LineNr">127 </span>  <span class="Constant">0f</span> <span class="Constant">8f</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
-<span id="L128" class="LineNr">128 </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="L129" class="LineNr">129 </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="L130" class="LineNr">130 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L131" class="LineNr">131 </span><span class="traceContains">+run: inst: 0x00000005</span>
-<span id="L132" class="LineNr">132 </span><span class="traceContains">+run: inst: 0x0000000a</span>
-<span id="L133" class="LineNr">133 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L134" class="LineNr">134 </span>
-<span id="L135" class="LineNr">135 </span><span class="SalientComment">//:: jump if greater or equal</span>
-<span id="L136" class="LineNr">136 </span>
-<span id="L137" class="LineNr">137 </span><span class="Delimiter">:(scenario jge_rel16_success)</span>
-<span id="L138" class="LineNr">138 </span><span class="Special">% SF = false;</span>
-<span id="L139" class="LineNr">139 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L140" class="LineNr">140 </span><span class="Comment"># op      ModRM   SIB   displacement  immediate</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Constant">0f</span> 8d                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
-<span id="L142" class="LineNr">142 </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="L143" class="LineNr">143 </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="L144" class="LineNr">144 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L145" class="LineNr">145 </span><span class="traceContains">+run: jump 5</span>
-<span id="L146" class="LineNr">146 </span><span class="traceContains">+run: inst: 0x0000000a</span>
-<span id="L147" class="LineNr">147 </span><span class="traceAbsent">-run: inst: 0x00000005</span>
-<span id="L148" class="LineNr">148 </span>
-<span id="L149" class="LineNr">149 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
-<span id="L150" class="LineNr">150 </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="L151" class="LineNr">151 </span>  <span class="Normal">int8_t</span> offset = <a href='015jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
-<span id="L152" class="LineNr">152 </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="L153" class="LineNr">153 </span>  <span class="Conceal">¦</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#L232'>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="L154" class="LineNr">154 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L155" class="LineNr">155 </span>  <span class="Delimiter">}</span>
-<span id="L156" class="LineNr">156 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L157" class="LineNr">157 </span><span class="Delimiter">}</span>
-<span id="L158" class="LineNr">158 </span>
-<span id="L159" class="LineNr">159 </span><span class="Delimiter">:(scenario jge_rel16_fail)</span>
-<span id="L160" class="LineNr">160 </span><span class="Special">% SF = true;</span>
-<span id="L161" class="LineNr">161 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L162" class="LineNr">162 </span><span class="Comment"># op      ModRM   SIB   displacement  immediate</span>
-<span id="L163" class="LineNr">163 </span>  <span class="Constant">0f</span> 8d                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
-<span id="L164" class="LineNr">164 </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="L165" class="LineNr">165 </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="L166" class="LineNr">166 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L167" class="LineNr">167 </span><span class="traceContains">+run: inst: 0x00000005</span>
-<span id="L168" class="LineNr">168 </span><span class="traceContains">+run: inst: 0x0000000a</span>
-<span id="L169" class="LineNr">169 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L170" class="LineNr">170 </span>
-<span id="L171" class="LineNr">171 </span><span class="SalientComment">//:: jump if lesser</span>
-<span id="L172" class="LineNr">172 </span>
-<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(scenario jl_rel16_success)</span>
-<span id="L174" class="LineNr">174 </span><span class="Special">% ZF = false;</span>
-<span id="L175" class="LineNr">175 </span><span class="Special">% SF = true;</span>
-<span id="L176" class="LineNr">176 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L177" class="LineNr">177 </span><span class="Comment"># op      ModRM   SIB   displacement  immediate</span>
-<span id="L178" class="LineNr">178 </span>  <span class="Constant">0f</span> 8c                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
-<span id="L179" class="LineNr">179 </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="L180" class="LineNr">180 </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="L181" class="LineNr">181 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L182" class="LineNr">182 </span><span class="traceContains">+run: jump 5</span>
-<span id="L183" class="LineNr">183 </span><span class="traceContains">+run: inst: 0x0000000a</span>
-<span id="L184" class="LineNr">184 </span><span class="traceAbsent">-run: inst: 0x00000005</span>
-<span id="L185" class="LineNr">185 </span>
-<span id="L186" class="LineNr">186 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
-<span id="L187" class="LineNr">187 </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="L188" class="LineNr">188 </span>  <span class="Normal">int8_t</span> offset = <a href='015jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
-<span id="L189" class="LineNr">189 </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="L190" class="LineNr">190 </span>  <span class="Conceal">¦</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#L232'>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="L191" class="LineNr">191 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L192" class="LineNr">192 </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="L195" class="LineNr">195 </span>
-<span id="L196" class="LineNr">196 </span><span class="Delimiter">:(scenario jl_rel16_fail)</span>
-<span id="L197" class="LineNr">197 </span><span class="Special">% ZF = false;</span>
-<span id="L198" class="LineNr">198 </span><span class="Special">% SF = false;</span>
-<span id="L199" class="LineNr">199 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L200" class="LineNr">200 </span><span class="Comment"># op      ModRM   SIB   displacement  immediate</span>
-<span id="L201" class="LineNr">201 </span>  <span class="Constant">0f</span> 8c                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
-<span id="L202" class="LineNr">202 </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="L203" class="LineNr">203 </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="L204" class="LineNr">204 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L205" class="LineNr">205 </span><span class="traceContains">+run: inst: 0x00000005</span>
-<span id="L206" class="LineNr">206 </span><span class="traceContains">+run: inst: 0x0000000a</span>
-<span id="L207" class="LineNr">207 </span><span class="traceAbsent">-run: jump 5</span>
-<span id="L208" class="LineNr">208 </span>
-<span id="L209" class="LineNr">209 </span><span class="SalientComment">//:: jump if lesser or equal</span>
-<span id="L210" class="LineNr">210 </span>
-<span id="L211" class="LineNr">211 </span><span class="Delimiter">:(scenario jle_rel16_equal)</span>
-<span id="L212" class="LineNr">212 </span><span class="Special">% ZF = true;</span>
-<span id="L213" class="LineNr">213 </span><span class="Special">% SF = false;</span>
-<span id="L214" class="LineNr">214 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L215" class="LineNr">215 </span><span class="Comment"># op      ModRM   SIB   displacement  immediate</span>
-<span id="L216" class="LineNr">216 </span>  <span class="Constant">0f</span> 8e                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
-<span id="L217" class="LineNr">217 </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="L218" class="LineNr">218 </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="L219" class="LineNr">219 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L220" class="LineNr">220 </span><span class="traceContains">+run: jump 5</span>
-<span id="L221" class="LineNr">221 </span><span class="traceContains">+run: inst: 0x0000000a</span>
-<span id="L222" class="LineNr">222 </span><span class="traceAbsent">-run: inst: 0x00000005</span>
-<span id="L223" class="LineNr">223 </span>
-<span id="L224" class="LineNr">224 </span><span class="Delimiter">:(scenario jle_rel16_lesser)</span>
-<span id="L225" class="LineNr">225 </span><span class="Special">% ZF = false;</span>
-<span id="L226" class="LineNr">226 </span><span class="Special">% SF = true;</span>
-<span id="L227" class="LineNr">227 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L228" class="LineNr">228 </span><span class="Comment"># op      ModRM   SIB   displacement  immediate</span>
-<span id="L229" class="LineNr">229 </span>  <span class="Constant">0f</span> 8e                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
-<span id="L230" class="LineNr">230 </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="L231" class="LineNr">231 </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="L232" class="LineNr">232 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L233" class="LineNr">233 </span><span class="traceContains">+run: jump 5</span>
-<span id="L234" class="LineNr">234 </span><span class="traceContains">+run: inst: 0x0000000a</span>
-<span id="L235" class="LineNr">235 </span><span class="traceAbsent">-run: inst: 0x00000005</span>
-<span id="L236" class="LineNr">236 </span>
-<span id="L237" class="LineNr">237 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
-<span id="L238" class="LineNr">238 </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="L239" class="LineNr">239 </span>  <span class="Normal">int8_t</span> offset = <a href='015jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
-<span id="L240" class="LineNr">240 </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="L241" class="LineNr">241 </span>  <span class="Conceal">¦</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#L232'>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="L242" class="LineNr">242 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L243" class="LineNr">243 </span>  <span class="Delimiter">}</span>
-<span id="L244" class="LineNr">244 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L245" class="LineNr">245 </span><span class="Delimiter">}</span>
-<span id="L246" class="LineNr">246 </span>
-<span id="L247" class="LineNr">247 </span><span class="Delimiter">:(scenario jle_rel16_greater)</span>
-<span id="L248" class="LineNr">248 </span><span class="Special">% ZF = false;</span>
-<span id="L249" class="LineNr">249 </span><span class="Special">% SF = false;</span>
-<span id="L250" class="LineNr">250 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
-<span id="L251" class="LineNr">251 </span><span class="Comment"># op      ModRM   SIB   displacement  immediate</span>
-<span id="L252" class="LineNr">252 </span>  <span class="Constant">0f</span> 8e                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
-<span id="L253" class="LineNr">253 </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="L254" class="LineNr">254 </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="L255" class="LineNr">255 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L256" class="LineNr">256 </span><span class="traceContains">+run: inst: 0x00000005</span>
-<span id="L257" class="LineNr">257 </span><span class="traceContains">+run: inst: 0x0000000a</span>
-<span id="L258" class="LineNr">258 </span><span class="traceAbsent">-run: jump 5</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>
diff --git a/html/subx/016jump_relative.cc.html b/html/subx/016jump_relative.cc.html
new file mode 100644
index 00000000..8c8dbbe1
--- /dev/null
+++ b/html/subx/016jump_relative.cc.html
@@ -0,0 +1,325 @@
+<!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/016jump_relative.cc</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="cpp">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<style type="text/css">
+<!--
+pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+a { color:#eeeeee; text-decoration: none; }
+a:hover { text-decoration: underline; }
+* { font-size: 12pt; font-size: 1em; }
+.traceAbsent { color: #c00000; }
+.traceContains { color: #008000; }
+.PreProc { color: #800080; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr">  1 </span><span class="Comment">//: jump to 16-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_rel16)</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>  e9                <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</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: 0x00000009</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">0xe9</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8</span>
+<span id="L17" class="LineNr"> 17 </span>  <span class="Normal">int16_t</span> offset = <a href='016jump_relative.cc.html#L23'>imm16</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; offset &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 class="Delimiter">:(code)</span>
+<span id="L23" class="LineNr"> 23 </span><span class="Normal">int16_t</span> <a href='016jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="Normal">int16_t</span> result = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L25" class="LineNr"> 25 </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="L26" class="LineNr"> 26 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L27" class="LineNr"> 27 </span><span class="Delimiter">}</span>
+<span id="L28" class="LineNr"> 28 </span>
+<span id="L29" class="LineNr"> 29 </span><span class="SalientComment">//:: jump if equal/zero</span>
+<span id="L30" class="LineNr"> 30 </span>
+<span id="L31" class="LineNr"> 31 </span><span class="Delimiter">:(scenario je_rel16_success)</span>
+<span id="L32" class="LineNr"> 32 </span><span class="Special">% ZF = true;</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>  <span class="Constant">0f</span> <span class="Constant">84</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
+<span id="L35" class="LineNr"> 35 </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="L36" class="LineNr"> 36 </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="L37" class="LineNr"> 37 </span><span class="traceContains">+run: inst: 0x00000001</span>
+<span id="L38" class="LineNr"> 38 </span><span class="traceContains">+run: jump 5</span>
+<span id="L39" class="LineNr"> 39 </span><span class="traceContains">+run: inst: 0x0000000a</span>
+<span id="L40" class="LineNr"> 40 </span><span class="traceAbsent">-run: inst: 0x00000005</span>
+<span id="L41" class="LineNr"> 41 </span>
+<span id="L42" class="LineNr"> 42 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
+<span id="L43" class="LineNr"> 43 </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="L44" class="LineNr"> 44 </span>  <span class="Normal">int8_t</span> offset = <a href='016jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
+<span id="L45" class="LineNr"> 45 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L46" class="LineNr"> 46 </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="L47" class="LineNr"> 47 </span>    <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L48" class="LineNr"> 48 </span>  <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 je_rel16_fail)</span>
+<span id="L53" class="LineNr"> 53 </span><span class="Special">% ZF = false;</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">0f</span> <span class="Constant">84</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
+<span id="L56" class="LineNr"> 56 </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="L57" class="LineNr"> 57 </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="L58" class="LineNr"> 58 </span><span class="traceContains">+run: inst: 0x00000001</span>
+<span id="L59" class="LineNr"> 59 </span><span class="traceContains">+run: inst: 0x00000005</span>
+<span id="L60" class="LineNr"> 60 </span><span class="traceContains">+run: inst: 0x0000000a</span>
+<span id="L61" class="LineNr"> 61 </span><span class="traceAbsent">-run: jump 5</span>
+<span id="L62" class="LineNr"> 62 </span>
+<span id="L63" class="LineNr"> 63 </span><span class="SalientComment">//:: jump if not equal/not zero</span>
+<span id="L64" class="LineNr"> 64 </span>
+<span id="L65" class="LineNr"> 65 </span><span class="Delimiter">:(scenario jne_rel16_success)</span>
+<span id="L66" class="LineNr"> 66 </span><span class="Special">% ZF = false;</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>  <span class="Constant">0f</span> <span class="Constant">85</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
+<span id="L69" class="LineNr"> 69 </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="L70" class="LineNr"> 70 </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="L71" class="LineNr"> 71 </span><span class="traceContains">+run: inst: 0x00000001</span>
+<span id="L72" class="LineNr"> 72 </span><span class="traceContains">+run: jump 5</span>
+<span id="L73" class="LineNr"> 73 </span><span class="traceContains">+run: inst: 0x0000000a</span>
+<span id="L74" class="LineNr"> 74 </span><span class="traceAbsent">-run: inst: 0x00000005</span>
+<span id="L75" class="LineNr"> 75 </span>
+<span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
+<span id="L77" class="LineNr"> 77 </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="L78" class="LineNr"> 78 </span>  <span class="Normal">int8_t</span> offset = <a href='016jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
+<span id="L79" class="LineNr"> 79 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L80" class="LineNr"> 80 </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="L81" class="LineNr"> 81 </span>    <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="Delimiter">}</span>
+<span id="L83" class="LineNr"> 83 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L84" class="LineNr"> 84 </span><span class="Delimiter">}</span>
+<span id="L85" class="LineNr"> 85 </span>
+<span id="L86" class="LineNr"> 86 </span><span class="Delimiter">:(scenario jne_rel16_fail)</span>
+<span id="L87" class="LineNr"> 87 </span><span class="Special">% ZF = true;</span>
+<span id="L88" class="LineNr"> 88 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
+<span id="L89" class="LineNr"> 89 </span>  <span class="Constant">0f</span> <span class="Constant">85</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
+<span id="L90" class="LineNr"> 90 </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="L91" class="LineNr"> 91 </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="L92" class="LineNr"> 92 </span><span class="traceContains">+run: inst: 0x00000001</span>
+<span id="L93" class="LineNr"> 93 </span><span class="traceContains">+run: inst: 0x00000005</span>
+<span id="L94" class="LineNr"> 94 </span><span class="traceContains">+run: inst: 0x0000000a</span>
+<span id="L95" class="LineNr"> 95 </span><span class="traceAbsent">-run: jump 5</span>
+<span id="L96" class="LineNr"> 96 </span>
+<span id="L97" class="LineNr"> 97 </span><span class="SalientComment">//:: jump if greater</span>
+<span id="L98" class="LineNr"> 98 </span>
+<span id="L99" class="LineNr"> 99 </span><span class="Delimiter">:(scenario jg_rel16_success)</span>
+<span id="L100" class="LineNr">100 </span><span class="Special">% ZF = false;</span>
+<span id="L101" class="LineNr">101 </span><span class="Special">% SF = false;</span>
+<span id="L102" class="LineNr">102 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</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">0f</span> <span class="Constant">8f</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
+<span id="L105" class="LineNr">105 </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="L106" class="LineNr">106 </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="L107" class="LineNr">107 </span><span class="traceContains">+run: inst: 0x00000001</span>
+<span id="L108" class="LineNr">108 </span><span class="traceContains">+run: jump 5</span>
+<span id="L109" class="LineNr">109 </span><span class="traceContains">+run: inst: 0x0000000a</span>
+<span id="L110" class="LineNr">110 </span><span class="traceAbsent">-run: inst: 0x00000005</span>
+<span id="L111" class="LineNr">111 </span>
+<span id="L112" class="LineNr">112 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
+<span id="L113" class="LineNr">113 </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="L114" class="LineNr">114 </span>  <span class="Normal">int8_t</span> offset = <a href='016jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
+<span id="L115" class="LineNr">115 </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="L116" class="LineNr">116 </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="L117" class="LineNr">117 </span>    <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L118" class="LineNr">118 </span>  <span class="Delimiter">}</span>
+<span id="L119" class="LineNr">119 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L120" class="LineNr">120 </span><span class="Delimiter">}</span>
+<span id="L121" class="LineNr">121 </span>
+<span id="L122" class="LineNr">122 </span><span class="Delimiter">:(scenario jg_rel16_fail)</span>
+<span id="L123" class="LineNr">123 </span><span class="Special">% ZF = false;</span>
+<span id="L124" class="LineNr">124 </span><span class="Special">% SF = true;</span>
+<span id="L125" class="LineNr">125 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</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="Constant">0f</span> <span class="Constant">8f</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
+<span id="L128" class="LineNr">128 </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="L129" class="LineNr">129 </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="L130" class="LineNr">130 </span><span class="traceContains">+run: inst: 0x00000001</span>
+<span id="L131" class="LineNr">131 </span><span class="traceContains">+run: inst: 0x00000005</span>
+<span id="L132" class="LineNr">132 </span><span class="traceContains">+run: inst: 0x0000000a</span>
+<span id="L133" class="LineNr">133 </span><span class="traceAbsent">-run: jump 5</span>
+<span id="L134" class="LineNr">134 </span>
+<span id="L135" class="LineNr">135 </span><span class="SalientComment">//:: jump if greater or equal</span>
+<span id="L136" class="LineNr">136 </span>
+<span id="L137" class="LineNr">137 </span><span class="Delimiter">:(scenario jge_rel16_success)</span>
+<span id="L138" class="LineNr">138 </span><span class="Special">% SF = false;</span>
+<span id="L139" class="LineNr">139 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
+<span id="L140" class="LineNr">140 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
+<span id="L141" class="LineNr">141 </span>  <span class="Constant">0f</span> 8d                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
+<span id="L142" class="LineNr">142 </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="L143" class="LineNr">143 </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="L144" class="LineNr">144 </span><span class="traceContains">+run: inst: 0x00000001</span>
+<span id="L145" class="LineNr">145 </span><span class="traceContains">+run: jump 5</span>
+<span id="L146" class="LineNr">146 </span><span class="traceContains">+run: inst: 0x0000000a</span>
+<span id="L147" class="LineNr">147 </span><span class="traceAbsent">-run: inst: 0x00000005</span>
+<span id="L148" class="LineNr">148 </span>
+<span id="L149" class="LineNr">149 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
+<span id="L150" class="LineNr">150 </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="L151" class="LineNr">151 </span>  <span class="Normal">int8_t</span> offset = <a href='016jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
+<span id="L152" class="LineNr">152 </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="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;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="L154" class="LineNr">154 </span>    <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L155" class="LineNr">155 </span>  <span class="Delimiter">}</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L157" class="LineNr">157 </span><span class="Delimiter">}</span>
+<span id="L158" class="LineNr">158 </span>
+<span id="L159" class="LineNr">159 </span><span class="Delimiter">:(scenario jge_rel16_fail)</span>
+<span id="L160" class="LineNr">160 </span><span class="Special">% SF = true;</span>
+<span id="L161" class="LineNr">161 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</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">0f</span> 8d                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
+<span id="L164" class="LineNr">164 </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="L165" class="LineNr">165 </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="L166" class="LineNr">166 </span><span class="traceContains">+run: inst: 0x00000001</span>
+<span id="L167" class="LineNr">167 </span><span class="traceContains">+run: inst: 0x00000005</span>
+<span id="L168" class="LineNr">168 </span><span class="traceContains">+run: inst: 0x0000000a</span>
+<span id="L169" class="LineNr">169 </span><span class="traceAbsent">-run: jump 5</span>
+<span id="L170" class="LineNr">170 </span>
+<span id="L171" class="LineNr">171 </span><span class="SalientComment">//:: jump if lesser</span>
+<span id="L172" class="LineNr">172 </span>
+<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(scenario jl_rel16_success)</span>
+<span id="L174" class="LineNr">174 </span><span class="Special">% ZF = false;</span>
+<span id="L175" class="LineNr">175 </span><span class="Special">% SF = true;</span>
+<span id="L176" class="LineNr">176 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</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">0f</span> 8c                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
+<span id="L179" class="LineNr">179 </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="L180" class="LineNr">180 </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="L181" class="LineNr">181 </span><span class="traceContains">+run: inst: 0x00000001</span>
+<span id="L182" class="LineNr">182 </span><span class="traceContains">+run: jump 5</span>
+<span id="L183" class="LineNr">183 </span><span class="traceContains">+run: inst: 0x0000000a</span>
+<span id="L184" class="LineNr">184 </span><span class="traceAbsent">-run: inst: 0x00000005</span>
+<span id="L185" class="LineNr">185 </span>
+<span id="L186" class="LineNr">186 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
+<span id="L187" class="LineNr">187 </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="L188" class="LineNr">188 </span>  <span class="Normal">int8_t</span> offset = <a href='016jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
+<span id="L189" class="LineNr">189 </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="L190" class="LineNr">190 </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="L191" class="LineNr">191 </span>    <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L192" class="LineNr">192 </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="L195" class="LineNr">195 </span>
+<span id="L196" class="LineNr">196 </span><span class="Delimiter">:(scenario jl_rel16_fail)</span>
+<span id="L197" class="LineNr">197 </span><span class="Special">% ZF = false;</span>
+<span id="L198" class="LineNr">198 </span><span class="Special">% SF = false;</span>
+<span id="L199" class="LineNr">199 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
+<span id="L200" class="LineNr">200 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Constant">0f</span> 8c                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
+<span id="L202" class="LineNr">202 </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="L203" class="LineNr">203 </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="L204" class="LineNr">204 </span><span class="traceContains">+run: inst: 0x00000001</span>
+<span id="L205" class="LineNr">205 </span><span class="traceContains">+run: inst: 0x00000005</span>
+<span id="L206" class="LineNr">206 </span><span class="traceContains">+run: inst: 0x0000000a</span>
+<span id="L207" class="LineNr">207 </span><span class="traceAbsent">-run: jump 5</span>
+<span id="L208" class="LineNr">208 </span>
+<span id="L209" class="LineNr">209 </span><span class="SalientComment">//:: jump if lesser or equal</span>
+<span id="L210" class="LineNr">210 </span>
+<span id="L211" class="LineNr">211 </span><span class="Delimiter">:(scenario jle_rel16_equal)</span>
+<span id="L212" class="LineNr">212 </span><span class="Special">% ZF = true;</span>
+<span id="L213" class="LineNr">213 </span><span class="Special">% SF = false;</span>
+<span id="L214" class="LineNr">214 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
+<span id="L215" class="LineNr">215 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
+<span id="L216" class="LineNr">216 </span>  <span class="Constant">0f</span> 8e                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
+<span id="L217" class="LineNr">217 </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="L218" class="LineNr">218 </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="L219" class="LineNr">219 </span><span class="traceContains">+run: inst: 0x00000001</span>
+<span id="L220" class="LineNr">220 </span><span class="traceContains">+run: jump 5</span>
+<span id="L221" class="LineNr">221 </span><span class="traceContains">+run: inst: 0x0000000a</span>
+<span id="L222" class="LineNr">222 </span><span class="traceAbsent">-run: inst: 0x00000005</span>
+<span id="L223" class="LineNr">223 </span>
+<span id="L224" class="LineNr">224 </span><span class="Delimiter">:(scenario jle_rel16_lesser)</span>
+<span id="L225" class="LineNr">225 </span><span class="Special">% ZF = false;</span>
+<span id="L226" class="LineNr">226 </span><span class="Special">% SF = true;</span>
+<span id="L227" class="LineNr">227 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
+<span id="L228" class="LineNr">228 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
+<span id="L229" class="LineNr">229 </span>  <span class="Constant">0f</span> 8e                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
+<span id="L230" class="LineNr">230 </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="L231" class="LineNr">231 </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="L232" class="LineNr">232 </span><span class="traceContains">+run: inst: 0x00000001</span>
+<span id="L233" class="LineNr">233 </span><span class="traceContains">+run: jump 5</span>
+<span id="L234" class="LineNr">234 </span><span class="traceContains">+run: inst: 0x0000000a</span>
+<span id="L235" class="LineNr">235 </span><span class="traceAbsent">-run: inst: 0x00000005</span>
+<span id="L236" class="LineNr">236 </span>
+<span id="L237" class="LineNr">237 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
+<span id="L238" class="LineNr">238 </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="L239" class="LineNr">239 </span>  <span class="Normal">int8_t</span> offset = <a href='016jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
+<span id="L240" class="LineNr">240 </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="L241" class="LineNr">241 </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="L242" class="LineNr">242 </span>    <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L243" class="LineNr">243 </span>  <span class="Delimiter">}</span>
+<span id="L244" class="LineNr">244 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L245" class="LineNr">245 </span><span class="Delimiter">}</span>
+<span id="L246" class="LineNr">246 </span>
+<span id="L247" class="LineNr">247 </span><span class="Delimiter">:(scenario jle_rel16_greater)</span>
+<span id="L248" class="LineNr">248 </span><span class="Special">% ZF = false;</span>
+<span id="L249" class="LineNr">249 </span><span class="Special">% SF = false;</span>
+<span id="L250" class="LineNr">250 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
+<span id="L251" class="LineNr">251 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
+<span id="L252" class="LineNr">252 </span>  <span class="Constant">0f</span> 8e                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
+<span id="L253" class="LineNr">253 </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="L254" class="LineNr">254 </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="L255" class="LineNr">255 </span><span class="traceContains">+run: inst: 0x00000001</span>
+<span id="L256" class="LineNr">256 </span><span class="traceContains">+run: inst: 0x00000005</span>
+<span id="L257" class="LineNr">257 </span><span class="traceContains">+run: inst: 0x0000000a</span>
+<span id="L258" class="LineNr">258 </span><span class="traceAbsent">-run: jump 5</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/016functions.cc.html b/html/subx/017functions.cc.html
index ae3c762e..c71b8a41 100644
--- a/html/subx/016functions.cc.html
+++ b/html/subx/017functions.cc.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/016functions.cc</title>
+<title>Mu - subx/017functions.cc</title>
 <meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
@@ -18,14 +18,14 @@ a:hover { text-decoration: underline; }
 .traceContains { color: #008000; }
 .PreProc { color: #800080; }
 .LineNr { color: #444444; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Identifier { color: #c0a020; }
-.Delimiter { color: #800080; }
 .Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .SalientComment { color: #00ffff; }
-.Special { color: #c00000; }
 -->
 </style>
 
@@ -64,7 +64,7 @@ if ('onhashchange' in window) {
 <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  ModRM   SIB   displacement  immediate</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>
@@ -75,10 +75,10 @@ if ('onhashchange' in window) {
 <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#L230'>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#L244'>push</a><span class="Delimiter">(</span><a href='010core.cc.html#L23'>EIP</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#L230'>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="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>
@@ -87,22 +87,22 @@ if ('onhashchange' in window) {
 <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  ModRM   SIB   displacement  immediate</span>
-<span id="L29" class="LineNr">29 </span>  ff  d3                                       <span class="Comment"># call function offset at EBX (reg 3)</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 effective address</span>
-<span id="L32" class="LineNr">32 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 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 effective address&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#L26'>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#L244'>push</a><span class="Delimiter">(</span><a href='010core.cc.html#L23'>EIP</a><span class="Delimiter">);</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#L230'>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="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>
@@ -110,11 +110,11 @@ if ('onhashchange' in window) {
 <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  ModRM   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 (reg 3)</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 effective address</span>
-<span id="L55" class="LineNr">55 </span><span class="traceContains">+run: effective address is mem at address 0x10 (reg 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>
@@ -124,7 +124,7 @@ if ('onhashchange' in window) {
 <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  ModRM   SIB   displacement  immediate</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>
@@ -133,8 +133,8 @@ if ('onhashchange' in window) {
 <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#L277'>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#L230'>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="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>
diff --git a/html/subx/020elf.cc.html b/html/subx/020elf.cc.html
new file mode 100644
index 00000000..ef3dea8b
--- /dev/null
+++ b/html/subx/020elf.cc.html
@@ -0,0 +1,138 @@
+<!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/020elf.cc</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="cpp">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<style type="text/css">
+<!--
+pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+a { color:#eeeeee; text-decoration: none; }
+a:hover { text-decoration: underline; }
+* { font-size: 12pt; font-size: 1em; }
+.Todo { color: #000000; background-color: #ffff00; padding-bottom: 1px; }
+.PreProc { color: #800080; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.cSpecial { color: #008000; }
+-->
+</style>
+
+<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">// <a href="https://github.com/kragen/stoneknifeforth/blob/702d2ebe1b/386.c">https://github.com/kragen/stoneknifeforth/blob/702d2ebe1b/386.c</a></span>
+<span id="L2" class="LineNr"> 2 </span>
+<span id="L3" class="LineNr"> 3 </span><span class="Delimiter">:(before &quot;End Main&quot;)</span>
+<span id="L4" class="LineNr"> 4 </span>assert<span class="Delimiter">(</span>argc &gt; <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L5" class="LineNr"> 5 </span><a href='000organization.cc.html#L139'>reset</a><span class="Delimiter">();</span>
+<span id="L6" class="LineNr"> 6 </span><a href='020elf.cc.html#L11'>load_elf</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">);</span>
+<span id="L7" class="LineNr"> 7 </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="L8" class="LineNr"> 8 </span>  <a href='010core.cc.html#L109'>run_one_instruction</a><span class="Delimiter">();</span>
+<span id="L9" class="LineNr"> 9 </span>
+<span id="L10" class="LineNr">10 </span><span class="Delimiter">:(code)</span>
+<span id="L11" class="LineNr">11 </span><span class="Normal">void</span> <a href='020elf.cc.html#L11'>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="L12" class="LineNr">12 </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="L13" class="LineNr">13 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>fd &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <a href='020elf.cc.html#L55'>die</a><span class="Delimiter">(</span><span class="Constant">&quot;</span><span class="cSpecial">%s</span><span class="Constant">: open&quot;</span><span class="Delimiter">,</span> filename<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
+<span id="L14" class="LineNr">14 </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="L15" class="LineNr">15 </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="L16" class="LineNr">16 </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="L17" class="LineNr">17 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents == <span class="Constant">NULL</span><span class="Delimiter">)</span> <a href='020elf.cc.html#L55'>die</a><span class="Delimiter">(</span><span class="Constant">&quot;malloc(</span><span class="cSpecial">%d</span><span class="Constant">)&quot;</span><span class="Delimiter">,</span> size<span class="Delimiter">);</span>
+<span id="L18" class="LineNr">18 </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="L19" class="LineNr">19 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size != read_size<span class="Delimiter">)</span> <a href='020elf.cc.html#L55'>die</a><span class="Delimiter">(</span><span class="Constant">&quot;read → </span><span class="cSpecial">%d</span><span class="Constant"> (!= </span><span class="cSpecial">%d</span><span class="Constant">)&quot;</span><span class="Delimiter">,</span> size<span class="Delimiter">,</span> read_size<span class="Delimiter">);</span>
+<span id="L20" class="LineNr">20 </span>  <a href='020elf.cc.html#L24'>load_elf_contents</a><span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">);</span>
+<span id="L21" class="LineNr">21 </span>  free<span class="Delimiter">(</span>elf_contents<span class="Delimiter">);</span>
+<span id="L22" class="LineNr">22 </span><span class="Delimiter">}</span>
+<span id="L23" class="LineNr">23 </span>
+<span id="L24" class="LineNr">24 </span><span class="Normal">void</span> <a href='020elf.cc.html#L24'>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> length<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L25" class="LineNr">25 </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="L26" class="LineNr">26 </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="L27" class="LineNr">27 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Constant">0</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 id="L28" class="LineNr">28 </span>    <a href='020elf.cc.html#L55'>die</a><span class="Delimiter">(</span><span class="Constant">&quot;Invalid ELF file starting with </span><span class="cSpecial">\&quot;</span><span class="cSpecial">%s</span><span class="cSpecial">\&quot;</span><span class="Constant">&quot;</span><span class="Delimiter">,</span> magic<span class="Delimiter">);</span>
+<span id="L29" class="LineNr">29 </span>
+<span id="L30" class="LineNr">30 </span>  <span class="Normal">uint32_t</span> e_type = <a href='020elf.cc.html#L51'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">16</span>]<span class="Delimiter">);</span>
+<span id="L31" class="LineNr">31 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Constant">0x00030002</span> != e_type<span class="Delimiter">)</span>
+<span id="L32" class="LineNr">32 </span>    <a href='020elf.cc.html#L55'>die</a><span class="Delimiter">(</span><span class="Constant">&quot;ELF type/machine 0x</span><span class="cSpecial">%x</span><span class="Constant"> isn't i386 executable&quot;</span><span class="Delimiter">,</span> e_type<span class="Delimiter">);</span>
+<span id="L33" class="LineNr">33 </span>
+<span id="L34" class="LineNr">34 </span>  <span class="Normal">uint32_t</span> e_entry = <a href='020elf.cc.html#L51'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">24</span>]<span class="Delimiter">);</span>
+<span id="L35" class="LineNr">35 </span>  <span class="Normal">uint32_t</span> e_phoff = <a href='020elf.cc.html#L51'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">28</span>]<span class="Delimiter">);</span>
+<span id="L36" class="LineNr">36 </span>  <span class="Normal">uint32_t</span> p_vaddr = <a href='020elf.cc.html#L51'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[e_phoff + <span class="Constant">8</span>]<span class="Delimiter">);</span>
+<span id="L37" class="LineNr">37 </span>  <span class="Normal">uint32_t</span> p_memsz = <a href='020elf.cc.html#L51'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[e_phoff + <span class="Constant">20</span>]<span class="Delimiter">);</span>
+<span id="L38" class="LineNr">38 </span>
+<span id="L39" class="LineNr">39 </span>  <a href='010core.cc.html#L67'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span>p_memsz<span class="Delimiter">);</span>  <span class="Comment">// </span><span class="Todo">TODO</span><span class="Comment">: not sure if this should be + p_vaddr</span>
+<span id="L40" class="LineNr">40 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>length &gt; p_memsz - p_vaddr<span class="Delimiter">)</span> length = p_memsz - p_vaddr<span class="Delimiter">;</span>
+<span id="L41" class="LineNr">41 </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; length<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span>
+<span id="L42" class="LineNr">42 </span>    <a href='010core.cc.html#L67'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>p_vaddr + i<span class="Delimiter">)</span> = elf_contents[i]<span class="Delimiter">;</span>
+<span id="L43" class="LineNr">43 </span>  <a href='010core.cc.html#L68'>End_of_program</a> = p_memsz<span class="Delimiter">;</span>
+<span id="L44" class="LineNr">44 </span>
+<span id="L45" class="LineNr">45 </span>  <span class="Comment">// </span><span class="Todo">TODO</span><span class="Comment">: need to set up real stack somewhere</span>
+<span id="L46" class="LineNr">46 </span>
+<span id="L47" class="LineNr">47 </span>  Reg[ESP]<span class="Delimiter">.</span>u = Reg[EBP]<span class="Delimiter">.</span>u = <a href='010core.cc.html#L68'>End_of_program</a><span class="Delimiter">;</span>
+<span id="L48" class="LineNr">48 </span>  <a href='010core.cc.html#L23'>EIP</a> = e_entry<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">inline</span> <span class="Normal">uint32_t</span> <a href='020elf.cc.html#L51'>u32_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L52" class="LineNr">52 </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="L53" class="LineNr">53 </span><span class="Delimiter">}</span>
+<span id="L54" class="LineNr">54 </span>
+<span id="L55" class="LineNr">55 </span><span class="Normal">void</span> <a href='020elf.cc.html#L55'>die</a><span class="Delimiter">(</span><span class="Normal">const</span> <span class="Normal">char</span>* format<span class="Delimiter">,</span> <span class="Delimiter">...)</span> <span class="Delimiter">{</span>
+<span id="L56" class="LineNr">56 </span>  <span class="Normal">va_list</span> args<span class="Delimiter">;</span>
+<span id="L57" class="LineNr">57 </span>  va_start<span class="Delimiter">(</span>args<span class="Delimiter">,</span> format<span class="Delimiter">);</span>
+<span id="L58" class="LineNr">58 </span>  vfprintf<span class="Delimiter">(</span><span class="Constant">stderr</span><span class="Delimiter">,</span> format<span class="Delimiter">,</span> args<span class="Delimiter">);</span>
+<span id="L59" class="LineNr">59 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>errno<span class="Delimiter">)</span>
+<span id="L60" class="LineNr">60 </span>    perror<span class="Delimiter">(</span><span class="Constant">&quot;&lt;200c&gt;&quot;</span><span class="Delimiter">);</span>
+<span id="L61" class="LineNr">61 </span>  <span class="Normal">else</span>
+<span id="L62" class="LineNr">62 </span>    fprintf<span class="Delimiter">(</span><span class="Constant">stderr</span><span class="Delimiter">,</span> <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L63" class="LineNr">63 </span>  va_end<span class="Delimiter">(</span>args<span class="Delimiter">);</span>
+<span id="L64" class="LineNr">64 </span>  abort<span class="Delimiter">();</span>
+<span id="L65" class="LineNr">65 </span><span class="Delimiter">}</span>
+<span id="L66" class="LineNr">66 </span>
+<span id="L67" class="LineNr">67 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L68" class="LineNr">68 </span><span class="PreProc">#include </span><span class="Constant">&lt;sys/types.h&gt;</span>
+<span id="L69" class="LineNr">69 </span><span class="PreProc">#include </span><span class="Constant">&lt;sys/stat.h&gt;</span>
+<span id="L70" class="LineNr">70 </span><span class="PreProc">#include </span><span class="Constant">&lt;fcntl.h&gt;</span>
+<span id="L71" class="LineNr">71 </span><span class="PreProc">#include </span><span class="Constant">&lt;unistd.h&gt;</span>
+<span id="L72" class="LineNr">72 </span><span class="PreProc">#include </span><span class="Constant">&lt;stdarg.h&gt;</span>
+<span id="L73" class="LineNr">73 </span><span class="PreProc">#include </span><span class="Constant">&lt;errno.h&gt;</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->