4830

New helper: printing a byte in textual (hex) form. This required adding instructions for bitwise shift operations.
author: Kartik Agaram <vc@akkartik.com> 2018-12-03 23:26:56 -0800
committer: Kartik Agaram <vc@akkartik.com> 2018-12-03 23:26:56 -0800
commit: 5f3b3e7aea4174f13da9b430538564c68257b647 (patch)
tree: 64b0ca70a7508aa10a008ad7d996f5d4f38214c8
parent: ee73f5eb31e9dd5a185da097bd990ac94c3d282b (diff)
download: mu-5f3b3e7aea4174f13da9b430538564c68257b647.tar.gz
13 files changed, 2092 insertions, 1113 deletions
diff --git a/html/subx/013direct_addressing.cc.html b/html/subx/013direct_addressing.cc.html
index 7fc2052c..d96502aa 100644
--- a/html/subx/013direct_addressing.cc.html
+++ b/html/subx/013direct_addressing.cc.html
@@ -185,7 +185,7 @@ if ('onhashchange' in window) {
 <span id="L117" class="LineNr">117 </span><span class="traceContains">+run: storing 0x0000000c</span>
 <span id="L118" class="LineNr">118 </span>
 <span id="L119" class="LineNr">119 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L120" class="LineNr">120 </span><span class="Normal">case</span> <span class="Constant">0xf7</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
+<span id="L120" class="LineNr">120 </span><span class="Normal">case</span> <span class="Constant">0xf7</span>: <span class="Delimiter">{</span>
 <span id="L121" class="LineNr">121 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L122" class="LineNr">122 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;operate on r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L123" class="LineNr">123 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
@@ -277,431 +277,589 @@ if ('onhashchange' in window) {
 <span id="L209" class="LineNr">209 </span><span class="traceContains">+run: subop: negate</span>
 <span id="L210" class="LineNr">210 </span><span class="traceContains">+run: overflow</span>
 <span id="L211" class="LineNr">211 </span>
-<span id="L212" class="LineNr">212 </span><span class="SalientComment">//:: and</span>
+<span id="L212" class="LineNr">212 </span><span class="SalientComment">//:: shift left</span>
 <span id="L213" class="LineNr">213 </span>
 <span id="L214" class="LineNr">214 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L215" class="LineNr">215 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise AND of r32 with rm32 (and)&quot;</span><span class="Delimiter">);</span>
+<span id="L215" class="LineNr">215 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;d3&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;shift rm32 by CL bits depending on subop (sal/sar/shl/shr)&quot;</span><span class="Delimiter">);</span>
 <span id="L216" class="LineNr">216 </span>
-<span id="L217" class="LineNr">217 </span><span class="Delimiter">:(scenario and_r32_with_r32)</span>
-<span id="L218" class="LineNr">218 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L219" class="LineNr">219 </span><span class="Special">% Reg[EBX].i = 0x000000ff;</span>
+<span id="L217" class="LineNr">217 </span><span class="Delimiter">:(scenario shift_left_r32_with_cl)</span>
+<span id="L218" class="LineNr">218 </span><span class="Special">% Reg[EBX].i = 13;</span>
+<span id="L219" class="LineNr">219 </span><span class="Special">% Reg[ECX].i = 1;</span>
 <span id="L220" class="LineNr">220 </span>== <span class="Constant">0x1</span>
 <span id="L221" class="LineNr">221 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Constant">21</span>  d8                                      <span class="Comment"># and EBX with destination EAX</span>
-<span id="L223" class="LineNr">223 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L224" class="LineNr">224 </span><span class="traceContains">+run: and <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L225" class="LineNr">225 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L226" class="LineNr">226 </span><span class="traceContains">+run: storing 0x0000000d</span>
-<span id="L227" class="LineNr">227 </span>
-<span id="L228" class="LineNr">228 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L229" class="LineNr">229 </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="L230" class="LineNr">230 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
-<span id="L231" class="LineNr">231 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L232" class="LineNr">232 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L222" class="LineNr">222 </span>  d3  e3                                      <span class="Comment"># negate EBX</span>
+<span id="L223" class="LineNr">223 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (subop shift left) 011 (dest EBX)</span>
+<span id="L224" class="LineNr">224 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L225" class="LineNr">225 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L226" class="LineNr">226 </span><span class="traceContains">+run: subop: shift left by CL bits</span>
+<span id="L227" class="LineNr">227 </span><span class="traceContains">+run: storing 0x0000001a</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">0xd3</span>: <span class="Delimiter">{</span>
+<span id="L231" class="LineNr">231 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
+<span id="L232" class="LineNr">232 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;operate on r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L233" class="LineNr">233 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L234" class="LineNr">234 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L235" class="LineNr">235 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L236" class="LineNr">236 </span><span class="Delimiter">}</span>
-<span id="L237" class="LineNr">237 </span>
-<span id="L238" class="LineNr">238 </span><span class="SalientComment">//:: or</span>
-<span id="L239" class="LineNr">239 </span>
-<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L241" class="LineNr">241 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise OR of r32 with rm32 (or)&quot;</span><span class="Delimiter">);</span>
-<span id="L242" class="LineNr">242 </span>
-<span id="L243" class="LineNr">243 </span><span class="Delimiter">:(scenario or_r32_with_r32)</span>
-<span id="L244" class="LineNr">244 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L245" class="LineNr">245 </span><span class="Special">% Reg[EBX].i = 0xa0b0c0d0;</span>
-<span id="L246" class="LineNr">246 </span>== <span class="Constant">0x1</span>
-<span id="L247" class="LineNr">247 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L248" class="LineNr">248 </span>  <span class="Error">09</span>  d8                                      <span class="Comment"># or EBX with destination EAX</span>
-<span id="L249" class="LineNr">249 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L250" class="LineNr">250 </span><span class="traceContains">+run: or <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L251" class="LineNr">251 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L252" class="LineNr">252 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
-<span id="L253" class="LineNr">253 </span>
-<span id="L254" class="LineNr">254 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L255" class="LineNr">255 </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="L256" class="LineNr">256 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
-<span id="L257" class="LineNr">257 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L258" class="LineNr">258 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L259" class="LineNr">259 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L260" class="LineNr">260 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L261" class="LineNr">261 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L262" class="LineNr">262 </span><span class="Delimiter">}</span>
-<span id="L263" class="LineNr">263 </span>
-<span id="L264" class="LineNr">264 </span><span class="SalientComment">//:: xor</span>
-<span id="L265" class="LineNr">265 </span>
-<span id="L266" class="LineNr">266 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L267" class="LineNr">267 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise XOR of r32 with rm32 (xor)&quot;</span><span class="Delimiter">);</span>
-<span id="L268" class="LineNr">268 </span>
-<span id="L269" class="LineNr">269 </span><span class="Delimiter">:(scenario xor_r32_with_r32)</span>
-<span id="L270" class="LineNr">270 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L271" class="LineNr">271 </span><span class="Special">% Reg[EBX].i = 0xaabbc0d0;</span>
-<span id="L272" class="LineNr">272 </span>== <span class="Constant">0x1</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>  <span class="Constant">31</span>  d8                                      <span class="Comment"># xor EBX with destination EAX</span>
-<span id="L275" class="LineNr">275 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L276" class="LineNr">276 </span><span class="traceContains">+run: xor <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L277" class="LineNr">277 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L278" class="LineNr">278 </span><span class="traceContains">+run: storing 0xa0b0ccdd</span>
-<span id="L279" class="LineNr">279 </span>
-<span id="L280" class="LineNr">280 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L281" class="LineNr">281 </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="L282" class="LineNr">282 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
-<span id="L283" class="LineNr">283 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L284" class="LineNr">284 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L285" class="LineNr">285 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L286" class="LineNr">286 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L287" class="LineNr">287 </span>  <span class="Identifier">break</span><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">//:: not</span>
-<span id="L291" class="LineNr">291 </span>
-<span id="L292" class="LineNr">292 </span><span class="Delimiter">:(scenario not_r32)</span>
-<span id="L293" class="LineNr">293 </span><span class="Special">% Reg[EBX].i = 0x0f0f00ff;</span>
-<span id="L294" class="LineNr">294 </span>== <span class="Constant">0x1</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>  f7  d3                                      <span class="Comment"># not EBX</span>
-<span id="L297" class="LineNr">297 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 010 (subop not) 011 (dest EBX)</span>
-<span id="L298" class="LineNr">298 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L299" class="LineNr">299 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L300" class="LineNr">300 </span><span class="traceContains">+run: subop: not</span>
-<span id="L301" class="LineNr">301 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
-<span id="L302" class="LineNr">302 </span>
-<span id="L303" class="LineNr">303 </span><span class="Delimiter">:(before &quot;End Op f7 Subops&quot;)</span>
-<span id="L304" class="LineNr">304 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span>  <span class="Comment">// not r/m32</span>
-<span id="L305" class="LineNr">305 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: not&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L306" class="LineNr">306 </span>  *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
-<span id="L307" class="LineNr">307 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L308" class="LineNr">308 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
-<span id="L309" class="LineNr">309 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L310" class="LineNr">310 </span>  <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L311" class="LineNr">311 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L312" class="LineNr">312 </span><span class="Delimiter">}</span>
+<span id="L234" class="LineNr">234 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
+<span id="L235" class="LineNr">235 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L236" class="LineNr">236 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift left r/m32 by CL</span>
+<span id="L237" class="LineNr">237 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift left by CL bits&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L238" class="LineNr">238 </span>    <span class="Normal">uint8_t</span> count = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
+<span id="L239" class="LineNr">239 </span>    <span class="Comment">// OF is only defined if count is 1</span>
+<span id="L240" class="LineNr">240 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L241" class="LineNr">241 </span>      <span class="Normal">bool</span> msb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x80000000</span><span class="Delimiter">)</span> &gt;&gt; <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L242" class="LineNr">242 </span>      <span class="Normal">bool</span> pnsb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x40000000</span><span class="Delimiter">);</span>
+<span id="L243" class="LineNr">243 </span>      <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>msb != pnsb<span class="Delimiter">);</span>
+<span id="L244" class="LineNr">244 </span>    <span class="Delimiter">}</span>
+<span id="L245" class="LineNr">245 </span>    *arg1 = <span class="Delimiter">(</span>*arg1 &lt;&lt; count<span class="Delimiter">);</span>
+<span id="L246" class="LineNr">246 </span>    ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L247" class="LineNr">247 </span>    SF = <span class="Delimiter">(</span>*arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L248" class="LineNr">248 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L249" class="LineNr">249 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L250" class="LineNr">250 </span>  <span class="Delimiter">}</span>
+<span id="L251" class="LineNr">251 </span>  <span class="Comment">// End Op d3 Subops</span>
+<span id="L252" class="LineNr">252 </span>  <span class="Normal">default</span>:
+<span id="L253" class="LineNr">253 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after d3: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L254" class="LineNr">254 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L255" class="LineNr">255 </span>  <span class="Delimiter">}</span>
+<span id="L256" class="LineNr">256 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L257" class="LineNr">257 </span><span class="Delimiter">}</span>
+<span id="L258" class="LineNr">258 </span>
+<span id="L259" class="LineNr">259 </span><span class="SalientComment">//:: shift right arithmetic</span>
+<span id="L260" class="LineNr">260 </span>
+<span id="L261" class="LineNr">261 </span><span class="Delimiter">:(scenario shift_right_arithmetic_r32_with_cl)</span>
+<span id="L262" class="LineNr">262 </span><span class="Special">% Reg[EBX].i = 26;</span>
+<span id="L263" class="LineNr">263 </span><span class="Special">% Reg[ECX].i = 1;</span>
+<span id="L264" class="LineNr">264 </span>== <span class="Constant">0x1</span>
+<span id="L265" class="LineNr">265 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L266" class="LineNr">266 </span>  d3  fb                                      <span class="Comment"># negate EBX</span>
+<span id="L267" class="LineNr">267 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
+<span id="L268" class="LineNr">268 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L269" class="LineNr">269 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L270" class="LineNr">270 </span><span class="traceContains">+run: subop: shift right by CL bits, while preserving sign</span>
+<span id="L271" class="LineNr">271 </span><span class="traceContains">+run: storing 0x0000000d</span>
+<span id="L272" class="LineNr">272 </span>
+<span id="L273" class="LineNr">273 </span><span class="Delimiter">:(before &quot;End Op d3 Subops&quot;)</span>
+<span id="L274" class="LineNr">274 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift right r/m32 by CL, preserving sign</span>
+<span id="L275" class="LineNr">275 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift right by CL bits, while preserving sign&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L276" class="LineNr">276 </span>  <span class="Normal">uint8_t</span> count = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
+<span id="L277" class="LineNr">277 </span>  *arg1 = <span class="Delimiter">(</span>*arg1 &gt;&gt; count<span class="Delimiter">);</span>
+<span id="L278" class="LineNr">278 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L279" class="LineNr">279 </span>  SF = <span class="Delimiter">(</span>*arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L280" class="LineNr">280 </span>  <span class="Comment">// OF is only defined if count is 1</span>
+<span id="L281" class="LineNr">281 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L282" class="LineNr">282 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L283" class="LineNr">283 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L284" class="LineNr">284 </span><span class="Delimiter">}</span>
+<span id="L285" class="LineNr">285 </span>
+<span id="L286" class="LineNr">286 </span><span class="Delimiter">:(scenario shift_right_arithmetic_odd_r32_with_cl)</span>
+<span id="L287" class="LineNr">287 </span><span class="Special">% Reg[EBX].i = 27;</span>
+<span id="L288" class="LineNr">288 </span><span class="Special">% Reg[ECX].i = 1;</span>
+<span id="L289" class="LineNr">289 </span>== <span class="Constant">0x1</span>
+<span id="L290" class="LineNr">290 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L291" class="LineNr">291 </span>  d3  fb                                      <span class="Comment"># negate EBX</span>
+<span id="L292" class="LineNr">292 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
+<span id="L293" class="LineNr">293 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L294" class="LineNr">294 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L295" class="LineNr">295 </span><span class="traceContains">+run: subop: shift right by CL bits, while preserving sign</span>
+<span id="L296" class="LineNr">296 </span><span class="Comment"># result: 13</span>
+<span id="L297" class="LineNr">297 </span><span class="traceContains">+run: storing 0x0000000d</span>
+<span id="L298" class="LineNr">298 </span>
+<span id="L299" class="LineNr">299 </span><span class="Delimiter">:(scenario shift_right_arithmetic_negative_r32_with_cl)</span>
+<span id="L300" class="LineNr">300 </span><span class="Special">% Reg[EBX].i = 0xfffffffd;  // -3</span>
+<span id="L301" class="LineNr">301 </span><span class="Special">% Reg[ECX].i = 1;</span>
+<span id="L302" class="LineNr">302 </span>== <span class="Constant">0x1</span>
+<span id="L303" class="LineNr">303 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L304" class="LineNr">304 </span>  d3  fb                                      <span class="Comment"># negate EBX</span>
+<span id="L305" class="LineNr">305 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
+<span id="L306" class="LineNr">306 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L307" class="LineNr">307 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L308" class="LineNr">308 </span><span class="traceContains">+run: subop: shift right by CL bits, while preserving sign</span>
+<span id="L309" class="LineNr">309 </span><span class="Comment"># result: -2</span>
+<span id="L310" class="LineNr">310 </span><span class="traceContains">+run: storing 0xfffffffe</span>
+<span id="L311" class="LineNr">311 </span>
+<span id="L312" class="LineNr">312 </span><span class="SalientComment">//:: shift right logical</span>
 <span id="L313" class="LineNr">313 </span>
-<span id="L314" class="LineNr">314 </span><span class="SalientComment">//:: compare (cmp)</span>
-<span id="L315" class="LineNr">315 </span>
-<span id="L316" class="LineNr">316 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L317" class="LineNr">317 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if rm32 &lt; r32 (cmp)&quot;</span><span class="Delimiter">);</span>
-<span id="L318" class="LineNr">318 </span>
-<span id="L319" class="LineNr">319 </span><span class="Delimiter">:(scenario compare_r32_with_r32_greater)</span>
-<span id="L320" class="LineNr">320 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L321" class="LineNr">321 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</span>
-<span id="L322" class="LineNr">322 </span>== <span class="Constant">0x1</span>
-<span id="L323" class="LineNr">323 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L324" class="LineNr">324 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L325" class="LineNr">325 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L326" class="LineNr">326 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L327" class="LineNr">327 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L328" class="LineNr">328 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L329" class="LineNr">329 </span>
-<span id="L330" class="LineNr">330 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L331" class="LineNr">331 </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="L332" class="LineNr">332 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
-<span id="L333" class="LineNr">333 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> reg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L334" class="LineNr">334 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L335" class="LineNr">335 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L336" class="LineNr">336 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L337" class="LineNr">337 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L338" class="LineNr">338 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L339" class="LineNr">339 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L340" class="LineNr">340 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L341" class="LineNr">341 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L342" class="LineNr">342 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L343" class="LineNr">343 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L344" class="LineNr">344 </span><span class="Delimiter">}</span>
-<span id="L345" class="LineNr">345 </span>
-<span id="L346" class="LineNr">346 </span><span class="Delimiter">:(scenario compare_r32_with_r32_lesser)</span>
-<span id="L347" class="LineNr">347 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c07;</span>
-<span id="L348" class="LineNr">348 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L349" class="LineNr">349 </span>== <span class="Constant">0x1</span>
-<span id="L350" class="LineNr">350 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L352" class="LineNr">352 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L354" class="LineNr">354 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L355" class="LineNr">355 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L356" class="LineNr">356 </span>
-<span id="L357" class="LineNr">357 </span><span class="Delimiter">:(scenario compare_r32_with_r32_equal)</span>
-<span id="L358" class="LineNr">358 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L359" class="LineNr">359 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L360" class="LineNr">360 </span>== <span class="Constant">0x1</span>
-<span id="L361" class="LineNr">361 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L362" class="LineNr">362 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L363" class="LineNr">363 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L364" class="LineNr">364 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L365" class="LineNr">365 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L366" class="LineNr">366 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L367" class="LineNr">367 </span>
-<span id="L368" class="LineNr">368 </span><span class="SalientComment">//:: copy (mov)</span>
+<span id="L314" class="LineNr">314 </span><span class="Delimiter">:(scenario shift_right_logical_r32_with_cl)</span>
+<span id="L315" class="LineNr">315 </span><span class="Special">% Reg[EBX].i = 26;</span>
+<span id="L316" class="LineNr">316 </span><span class="Special">% Reg[ECX].i = 1;</span>
+<span id="L317" class="LineNr">317 </span>== <span class="Constant">0x1</span>
+<span id="L318" class="LineNr">318 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L319" class="LineNr">319 </span>  d3  eb                                      <span class="Comment"># negate EBX</span>
+<span id="L320" class="LineNr">320 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
+<span id="L321" class="LineNr">321 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L322" class="LineNr">322 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L323" class="LineNr">323 </span><span class="traceContains">+run: subop: shift right by CL bits, while padding zeroes</span>
+<span id="L324" class="LineNr">324 </span><span class="traceContains">+run: storing 0x0000000d</span>
+<span id="L325" class="LineNr">325 </span>
+<span id="L326" class="LineNr">326 </span><span class="Delimiter">:(before &quot;End Op d3 Subops&quot;)</span>
+<span id="L327" class="LineNr">327 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift right r/m32 by CL, preserving sign</span>
+<span id="L328" class="LineNr">328 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift right by CL bits, while padding zeroes&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L329" class="LineNr">329 </span>  <span class="Normal">uint8_t</span> count = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ECX]<span class="Delimiter">.</span>u &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
+<span id="L330" class="LineNr">330 </span>  <span class="Comment">// OF is only defined if count is 1</span>
+<span id="L331" class="LineNr">331 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L332" class="LineNr">332 </span>    <span class="Normal">bool</span> msb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x80000000</span><span class="Delimiter">)</span> &gt;&gt; <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L333" class="LineNr">333 </span>    <span class="Normal">bool</span> pnsb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x40000000</span><span class="Delimiter">);</span>
+<span id="L334" class="LineNr">334 </span>    <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>msb != pnsb<span class="Delimiter">);</span>
+<span id="L335" class="LineNr">335 </span>  <span class="Delimiter">}</span>
+<span id="L336" class="LineNr">336 </span>  <span class="Normal">uint32_t</span>* uarg1 = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>arg1<span class="Delimiter">);</span>
+<span id="L337" class="LineNr">337 </span>  *uarg1 = <span class="Delimiter">(</span>*uarg1 &gt;&gt; count<span class="Delimiter">);</span>
+<span id="L338" class="LineNr">338 </span>  ZF = <span class="Delimiter">(</span>*uarg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L339" class="LineNr">339 </span>  <span class="Comment">// result is always positive by definition</span>
+<span id="L340" class="LineNr">340 </span>  SF =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L341" class="LineNr">341 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L342" class="LineNr">342 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L343" class="LineNr">343 </span><span class="Delimiter">}</span>
+<span id="L344" class="LineNr">344 </span>
+<span id="L345" class="LineNr">345 </span><span class="Delimiter">:(scenario shift_right_logical_odd_r32_with_cl)</span>
+<span id="L346" class="LineNr">346 </span><span class="Special">% Reg[EBX].i = 27;</span>
+<span id="L347" class="LineNr">347 </span><span class="Special">% Reg[ECX].i = 1;</span>
+<span id="L348" class="LineNr">348 </span>== <span class="Constant">0x1</span>
+<span id="L349" class="LineNr">349 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L350" class="LineNr">350 </span>  d3  eb                                      <span class="Comment"># negate EBX</span>
+<span id="L351" class="LineNr">351 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
+<span id="L352" class="LineNr">352 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L354" class="LineNr">354 </span><span class="traceContains">+run: subop: shift right by CL bits, while padding zeroes</span>
+<span id="L355" class="LineNr">355 </span><span class="Comment"># result: 13</span>
+<span id="L356" class="LineNr">356 </span><span class="traceContains">+run: storing 0x0000000d</span>
+<span id="L357" class="LineNr">357 </span>
+<span id="L358" class="LineNr">358 </span><span class="Delimiter">:(scenario shift_right_logical_negative_r32_with_cl)</span>
+<span id="L359" class="LineNr">359 </span><span class="Special">% Reg[EBX].i = 0xfffffffd;</span>
+<span id="L360" class="LineNr">360 </span><span class="Special">% Reg[ECX].i = 1;</span>
+<span id="L361" class="LineNr">361 </span>== <span class="Constant">0x1</span>
+<span id="L362" class="LineNr">362 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L363" class="LineNr">363 </span>  d3  eb                                      <span class="Comment"># negate EBX</span>
+<span id="L364" class="LineNr">364 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
+<span id="L365" class="LineNr">365 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L366" class="LineNr">366 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L367" class="LineNr">367 </span><span class="traceContains">+run: subop: shift right by CL bits, while padding zeroes</span>
+<span id="L368" class="LineNr">368 </span><span class="traceContains">+run: storing 0x7ffffffe</span>
 <span id="L369" class="LineNr">369 </span>
-<span id="L370" class="LineNr">370 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L371" class="LineNr">371 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r32 to rm32 (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L372" class="LineNr">372 </span>
-<span id="L373" class="LineNr">373 </span><span class="Delimiter">:(scenario copy_r32_to_r32)</span>
-<span id="L374" class="LineNr">374 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
-<span id="L375" class="LineNr">375 </span>== <span class="Constant">0x1</span>
-<span id="L376" class="LineNr">376 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L377" class="LineNr">377 </span>  <span class="Constant">89</span>  d8                                      <span class="Comment"># copy EBX to EAX</span>
-<span id="L378" class="LineNr">378 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L379" class="LineNr">379 </span><span class="traceContains">+run: copy <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L380" class="LineNr">380 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L381" class="LineNr">381 </span><span class="traceContains">+run: storing 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">0x89</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r32 to r/m32</span>
-<span id="L385" class="LineNr">385 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
-<span id="L386" class="LineNr">386 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rsrc = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L387" class="LineNr">387 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L388" class="LineNr">388 </span>  <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L389" class="LineNr">389 </span>  *dest = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rsrc]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L390" class="LineNr">390 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *dest &lt;&lt; end<span class="Delimiter">();</span>
-<span id="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="L393" class="LineNr">393 </span>
-<span id="L394" class="LineNr">394 </span><span class="SalientComment">//:: xchg</span>
+<span id="L370" class="LineNr">370 </span><span class="SalientComment">//:: and</span>
+<span id="L371" class="LineNr">371 </span>
+<span id="L372" class="LineNr">372 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L373" class="LineNr">373 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise AND of r32 with rm32 (and)&quot;</span><span class="Delimiter">);</span>
+<span id="L374" class="LineNr">374 </span>
+<span id="L375" class="LineNr">375 </span><span class="Delimiter">:(scenario and_r32_with_r32)</span>
+<span id="L376" class="LineNr">376 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L377" class="LineNr">377 </span><span class="Special">% Reg[EBX].i = 0x000000ff;</span>
+<span id="L378" class="LineNr">378 </span>== <span class="Constant">0x1</span>
+<span id="L379" class="LineNr">379 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L380" class="LineNr">380 </span>  <span class="Constant">21</span>  d8                                      <span class="Comment"># and EBX with destination EAX</span>
+<span id="L381" class="LineNr">381 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L382" class="LineNr">382 </span><span class="traceContains">+run: and <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L383" class="LineNr">383 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L384" class="LineNr">384 </span><span class="traceContains">+run: storing 0x0000000d</span>
+<span id="L385" class="LineNr">385 </span>
+<span id="L386" class="LineNr">386 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L387" class="LineNr">387 </span><span class="Normal">case</span> <span class="Constant">0x21</span>: <span class="Delimiter">{</span>  <span class="Comment">// and r32 with r/m32</span>
+<span id="L388" class="LineNr">388 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
+<span id="L389" class="LineNr">389 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L390" class="LineNr">390 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L391" class="LineNr">391 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L392" class="LineNr">392 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L393" class="LineNr">393 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L394" class="LineNr">394 </span><span class="Delimiter">}</span>
 <span id="L395" class="LineNr">395 </span>
-<span id="L396" class="LineNr">396 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L397" class="LineNr">397 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;swap the <a href='003trace.cc.html#L74'>contents</a> of r32 and rm32 (xchg)&quot;</span><span class="Delimiter">);</span>
-<span id="L398" class="LineNr">398 </span>
-<span id="L399" class="LineNr">399 </span><span class="Delimiter">:(scenario xchg_r32_with_r32)</span>
-<span id="L400" class="LineNr">400 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
-<span id="L401" class="LineNr">401 </span><span class="Special">% Reg[EAX].i = 0x2e;</span>
-<span id="L402" class="LineNr">402 </span>== <span class="Constant">0x1</span>
-<span id="L403" class="LineNr">403 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L404" class="LineNr">404 </span>  <span class="Constant">87</span>  d8                                      <span class="Comment"># exchange EBX with EAX</span>
-<span id="L405" class="LineNr">405 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L406" class="LineNr">406 </span><span class="traceContains">+run: exchange <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L407" class="LineNr">407 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L408" class="LineNr">408 </span><span class="traceContains">+run: storing 0x000000af in r/m32</span>
-<span id="L409" class="LineNr">409 </span><span class="traceContains">+run: storing 0x0000002e in <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L410" class="LineNr">410 </span>
-<span id="L411" class="LineNr">411 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L412" class="LineNr">412 </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="L413" class="LineNr">413 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
-<span id="L414" class="LineNr">414 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> reg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L415" class="LineNr">415 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;exchange &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L416" class="LineNr">416 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L417" class="LineNr">417 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp = *arg1<span class="Delimiter">;</span>
-<span id="L418" class="LineNr">418 </span>  *arg1 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L419" class="LineNr">419 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i = tmp<span class="Delimiter">;</span>
-<span id="L420" class="LineNr">420 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <span class="Constant">&quot; in r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L421" class="LineNr">421 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i &lt;&lt; <span class="Constant">&quot; in &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L422" class="LineNr">422 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L423" class="LineNr">423 </span><span class="Delimiter">}</span>
-<span id="L424" class="LineNr">424 </span>
-<span id="L425" class="LineNr">425 </span><span class="SalientComment">//:: increment</span>
+<span id="L396" class="LineNr">396 </span><span class="SalientComment">//:: or</span>
+<span id="L397" class="LineNr">397 </span>
+<span id="L398" class="LineNr">398 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L399" class="LineNr">399 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise OR of r32 with rm32 (or)&quot;</span><span class="Delimiter">);</span>
+<span id="L400" class="LineNr">400 </span>
+<span id="L401" class="LineNr">401 </span><span class="Delimiter">:(scenario or_r32_with_r32)</span>
+<span id="L402" class="LineNr">402 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L403" class="LineNr">403 </span><span class="Special">% Reg[EBX].i = 0xa0b0c0d0;</span>
+<span id="L404" class="LineNr">404 </span>== <span class="Constant">0x1</span>
+<span id="L405" class="LineNr">405 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L406" class="LineNr">406 </span>  <span class="Error">09</span>  d8                                      <span class="Comment"># or EBX with destination EAX</span>
+<span id="L407" class="LineNr">407 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L408" class="LineNr">408 </span><span class="traceContains">+run: or <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L409" class="LineNr">409 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L410" class="LineNr">410 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
+<span id="L411" class="LineNr">411 </span>
+<span id="L412" class="LineNr">412 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L413" class="LineNr">413 </span><span class="Normal">case</span> <span class="Constant">0x09</span>: <span class="Delimiter">{</span>  <span class="Comment">// or r32 with r/m32</span>
+<span id="L414" class="LineNr">414 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
+<span id="L415" class="LineNr">415 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L416" class="LineNr">416 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L417" class="LineNr">417 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L418" class="LineNr">418 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L419" class="LineNr">419 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L420" class="LineNr">420 </span><span class="Delimiter">}</span>
+<span id="L421" class="LineNr">421 </span>
+<span id="L422" class="LineNr">422 </span><span class="SalientComment">//:: xor</span>
+<span id="L423" class="LineNr">423 </span>
+<span id="L424" class="LineNr">424 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L425" class="LineNr">425 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise XOR of r32 with rm32 (xor)&quot;</span><span class="Delimiter">);</span>
 <span id="L426" class="LineNr">426 </span>
-<span id="L427" class="LineNr">427 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L428" class="LineNr">428 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;40&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L13'>EAX</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L429" class="LineNr">429 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;41&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L14'>ECX</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L430" class="LineNr">430 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;42&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L15'>EDX</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L431" class="LineNr">431 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;43&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L16'>EBX</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L432" class="LineNr">432 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;44&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L17'>ESP</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L433" class="LineNr">433 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;45&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L18'>EBP</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L434" class="LineNr">434 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;46&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L19'>ESI</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L435" class="LineNr">435 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;47&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L20'>EDI</a> (inc)&quot;</span><span class="Delimiter">);</span>
-<span id="L436" class="LineNr">436 </span>
-<span id="L437" class="LineNr">437 </span><span class="Delimiter">:(scenario increment_r32)</span>
-<span id="L438" class="LineNr">438 </span><span class="Special">% Reg[ECX].u = 0x1f;</span>
-<span id="L439" class="LineNr">439 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L440" class="LineNr">440 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L441" class="LineNr">441 </span>  <span class="Constant">41</span>                                          <span class="Comment"># increment ECX</span>
-<span id="L442" class="LineNr">442 </span><span class="traceContains">+run: increment <a href='010---vm.cc.html#L14'>ECX</a></span>
-<span id="L443" class="LineNr">443 </span><span class="traceContains">+run: storing value 0x00000020</span>
-<span id="L444" class="LineNr">444 </span>
-<span id="L445" class="LineNr">445 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L446" class="LineNr">446 </span><span class="Normal">case</span> <span class="Constant">0x40</span>:
-<span id="L447" class="LineNr">447 </span><span class="Normal">case</span> <span class="Constant">0x41</span>:
-<span id="L448" class="LineNr">448 </span><span class="Normal">case</span> <span class="Constant">0x42</span>:
-<span id="L449" class="LineNr">449 </span><span class="Normal">case</span> <span class="Constant">0x43</span>:
-<span id="L450" class="LineNr">450 </span><span class="Normal">case</span> <span class="Constant">0x44</span>:
-<span id="L451" class="LineNr">451 </span><span class="Normal">case</span> <span class="Constant">0x45</span>:
-<span id="L452" class="LineNr">452 </span><span class="Normal">case</span> <span class="Constant">0x46</span>:
-<span id="L453" class="LineNr">453 </span><span class="Normal">case</span> <span class="Constant">0x47</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r32</span>
-<span id="L454" class="LineNr">454 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L455" class="LineNr">455 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L456" class="LineNr">456 </span>  ++<span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L457" class="LineNr">457 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L458" class="LineNr">458 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L459" class="LineNr">459 </span><span class="Delimiter">}</span>
+<span id="L427" class="LineNr">427 </span><span class="Delimiter">:(scenario xor_r32_with_r32)</span>
+<span id="L428" class="LineNr">428 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L429" class="LineNr">429 </span><span class="Special">% Reg[EBX].i = 0xaabbc0d0;</span>
+<span id="L430" class="LineNr">430 </span>== <span class="Constant">0x1</span>
+<span id="L431" class="LineNr">431 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L432" class="LineNr">432 </span>  <span class="Constant">31</span>  d8                                      <span class="Comment"># xor EBX with destination EAX</span>
+<span id="L433" class="LineNr">433 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L434" class="LineNr">434 </span><span class="traceContains">+run: xor <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L435" class="LineNr">435 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L436" class="LineNr">436 </span><span class="traceContains">+run: storing 0xa0b0ccdd</span>
+<span id="L437" class="LineNr">437 </span>
+<span id="L438" class="LineNr">438 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L439" class="LineNr">439 </span><span class="Normal">case</span> <span class="Constant">0x31</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
+<span id="L440" class="LineNr">440 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
+<span id="L441" class="LineNr">441 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L442" class="LineNr">442 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L443" class="LineNr">443 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L444" class="LineNr">444 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L445" class="LineNr">445 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L446" class="LineNr">446 </span><span class="Delimiter">}</span>
+<span id="L447" class="LineNr">447 </span>
+<span id="L448" class="LineNr">448 </span><span class="SalientComment">//:: not</span>
+<span id="L449" class="LineNr">449 </span>
+<span id="L450" class="LineNr">450 </span><span class="Delimiter">:(scenario not_r32)</span>
+<span id="L451" class="LineNr">451 </span><span class="Special">% Reg[EBX].i = 0x0f0f00ff;</span>
+<span id="L452" class="LineNr">452 </span>== <span class="Constant">0x1</span>
+<span id="L453" class="LineNr">453 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L454" class="LineNr">454 </span>  f7  d3                                      <span class="Comment"># not EBX</span>
+<span id="L455" class="LineNr">455 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 010 (subop not) 011 (dest EBX)</span>
+<span id="L456" class="LineNr">456 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L457" class="LineNr">457 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L458" class="LineNr">458 </span><span class="traceContains">+run: subop: not</span>
+<span id="L459" class="LineNr">459 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
 <span id="L460" class="LineNr">460 </span>
-<span id="L461" class="LineNr">461 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L462" class="LineNr">462 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment/decrement/jump/push/call rm32 based on subop (inc/dec/jmp/push/call)&quot;</span><span class="Delimiter">);</span>
-<span id="L463" class="LineNr">463 </span>
-<span id="L464" class="LineNr">464 </span><span class="Delimiter">:(scenario increment_rm32)</span>
-<span id="L465" class="LineNr">465 </span><span class="Special">% Reg[EAX].u = 0x20;</span>
-<span id="L466" class="LineNr">466 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L467" class="LineNr">467 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L468" class="LineNr">468 </span>  ff  c0                                      <span class="Comment"># increment EAX</span>
-<span id="L469" class="LineNr">469 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 000 (subop inc) 000 (EAX)</span>
-<span id="L470" class="LineNr">470 </span><span class="traceContains">+run: increment r/m32</span>
-<span id="L471" class="LineNr">471 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L472" class="LineNr">472 </span><span class="traceContains">+run: storing value 0x00000021</span>
+<span id="L461" class="LineNr">461 </span><span class="Delimiter">:(before &quot;End Op f7 Subops&quot;)</span>
+<span id="L462" class="LineNr">462 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span>  <span class="Comment">// not r/m32</span>
+<span id="L463" class="LineNr">463 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: not&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L464" class="LineNr">464 </span>  *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
+<span id="L465" class="LineNr">465 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L466" class="LineNr">466 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
+<span id="L467" class="LineNr">467 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L468" class="LineNr">468 </span>  <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L469" class="LineNr">469 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L470" class="LineNr">470 </span><span class="Delimiter">}</span>
+<span id="L471" class="LineNr">471 </span>
+<span id="L472" class="LineNr">472 </span><span class="SalientComment">//:: compare (cmp)</span>
 <span id="L473" class="LineNr">473 </span>
-<span id="L474" class="LineNr">474 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L475" class="LineNr">475 </span><span class="Normal">case</span> <span class="Constant">0xff</span>: <span class="Delimiter">{</span>
-<span id="L476" class="LineNr">476 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
-<span id="L477" class="LineNr">477 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
-<span id="L478" class="LineNr">478 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L479" class="LineNr">479 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r/m32</span>
-<span id="L480" class="LineNr">480 </span>      <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L481" class="LineNr">481 </span>      <span class="Normal">int32_t</span>* <a href='001help.cc.html#L15'>arg</a> = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L482" class="LineNr">482 </span>      ++*arg<span class="Delimiter">;</span>
-<span id="L483" class="LineNr">483 </span>      <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L484" class="LineNr">484 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L485" class="LineNr">485 </span>    <span class="Delimiter">}</span>
-<span id="L486" class="LineNr">486 </span>    <span class="Normal">default</span>:
-<span id="L487" class="LineNr">487 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for ff: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L412'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L488" class="LineNr">488 </span>      <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L489" class="LineNr">489 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L490" class="LineNr">490 </span>    <span class="Comment">// End Op ff Subops</span>
-<span id="L491" class="LineNr">491 </span>  <span class="Delimiter">}</span>
-<span id="L492" class="LineNr">492 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L493" class="LineNr">493 </span><span class="Delimiter">}</span>
-<span id="L494" class="LineNr">494 </span>
-<span id="L495" class="LineNr">495 </span><span class="SalientComment">//:: decrement</span>
-<span id="L496" class="LineNr">496 </span>
-<span id="L497" class="LineNr">497 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L498" class="LineNr">498 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;48&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L13'>EAX</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L499" class="LineNr">499 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;49&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L14'>ECX</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L500" class="LineNr">500 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L15'>EDX</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L501" class="LineNr">501 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L16'>EBX</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L502" class="LineNr">502 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L17'>ESP</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L503" class="LineNr">503 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L18'>EBP</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L504" class="LineNr">504 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L19'>ESI</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L505" class="LineNr">505 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L20'>EDI</a> (dec)&quot;</span><span class="Delimiter">);</span>
-<span id="L506" class="LineNr">506 </span>
-<span id="L507" class="LineNr">507 </span><span class="Delimiter">:(scenario decrement_r32)</span>
-<span id="L508" class="LineNr">508 </span><span class="Special">% Reg[ECX].u = 0x1f;</span>
-<span id="L509" class="LineNr">509 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L510" class="LineNr">510 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L511" class="LineNr">511 </span>  <span class="Constant">49</span>                                          <span class="Comment"># decrement ECX</span>
-<span id="L512" class="LineNr">512 </span><span class="traceContains">+run: decrement <a href='010---vm.cc.html#L14'>ECX</a></span>
-<span id="L513" class="LineNr">513 </span><span class="traceContains">+run: storing value 0x0000001e</span>
+<span id="L474" class="LineNr">474 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L475" class="LineNr">475 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if rm32 &lt; r32 (cmp)&quot;</span><span class="Delimiter">);</span>
+<span id="L476" class="LineNr">476 </span>
+<span id="L477" class="LineNr">477 </span><span class="Delimiter">:(scenario compare_r32_with_r32_greater)</span>
+<span id="L478" class="LineNr">478 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L479" class="LineNr">479 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</span>
+<span id="L480" class="LineNr">480 </span>== <span class="Constant">0x1</span>
+<span id="L481" class="LineNr">481 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L482" class="LineNr">482 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
+<span id="L483" class="LineNr">483 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L484" class="LineNr">484 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L485" class="LineNr">485 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L486" class="LineNr">486 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
+<span id="L487" class="LineNr">487 </span>
+<span id="L488" class="LineNr">488 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L489" class="LineNr">489 </span><span class="Normal">case</span> <span class="Constant">0x39</span>: <span class="Delimiter">{</span>  <span class="Comment">// set SF if r/m32 &lt; r32</span>
+<span id="L490" class="LineNr">490 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
+<span id="L491" class="LineNr">491 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> reg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L492" class="LineNr">492 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L493" class="LineNr">493 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L494" class="LineNr">494 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L495" class="LineNr">495 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L496" class="LineNr">496 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L497" class="LineNr">497 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L498" class="LineNr">498 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L499" class="LineNr">499 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L500" class="LineNr">500 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L501" class="LineNr">501 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L502" class="LineNr">502 </span><span class="Delimiter">}</span>
+<span id="L503" class="LineNr">503 </span>
+<span id="L504" class="LineNr">504 </span><span class="Delimiter">:(scenario compare_r32_with_r32_lesser)</span>
+<span id="L505" class="LineNr">505 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c07;</span>
+<span id="L506" class="LineNr">506 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
+<span id="L507" class="LineNr">507 </span>== <span class="Constant">0x1</span>
+<span id="L508" class="LineNr">508 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L509" class="LineNr">509 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
+<span id="L510" class="LineNr">510 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L511" class="LineNr">511 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L512" class="LineNr">512 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L513" class="LineNr">513 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
 <span id="L514" class="LineNr">514 </span>
-<span id="L515" class="LineNr">515 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L516" class="LineNr">516 </span><span class="Normal">case</span> <span class="Constant">0x48</span>:
-<span id="L517" class="LineNr">517 </span><span class="Normal">case</span> <span class="Constant">0x49</span>:
-<span id="L518" class="LineNr">518 </span><span class="Normal">case</span> <span class="Constant">0x4a</span>:
-<span id="L519" class="LineNr">519 </span><span class="Normal">case</span> <span class="Constant">0x4b</span>:
-<span id="L520" class="LineNr">520 </span><span class="Normal">case</span> <span class="Constant">0x4c</span>:
-<span id="L521" class="LineNr">521 </span><span class="Normal">case</span> <span class="Constant">0x4d</span>:
-<span id="L522" class="LineNr">522 </span><span class="Normal">case</span> <span class="Constant">0x4e</span>:
-<span id="L523" class="LineNr">523 </span><span class="Normal">case</span> <span class="Constant">0x4f</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r32</span>
-<span id="L524" class="LineNr">524 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L525" class="LineNr">525 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L526" class="LineNr">526 </span>  --<span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L527" class="LineNr">527 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L528" class="LineNr">528 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L529" class="LineNr">529 </span><span class="Delimiter">}</span>
+<span id="L515" class="LineNr">515 </span><span class="Delimiter">:(scenario compare_r32_with_r32_equal)</span>
+<span id="L516" class="LineNr">516 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L517" class="LineNr">517 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
+<span id="L518" class="LineNr">518 </span>== <span class="Constant">0x1</span>
+<span id="L519" class="LineNr">519 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L520" class="LineNr">520 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
+<span id="L521" class="LineNr">521 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L522" class="LineNr">522 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L523" class="LineNr">523 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L524" class="LineNr">524 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
+<span id="L525" class="LineNr">525 </span>
+<span id="L526" class="LineNr">526 </span><span class="SalientComment">//:: copy (mov)</span>
+<span id="L527" class="LineNr">527 </span>
+<span id="L528" class="LineNr">528 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L529" class="LineNr">529 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r32 to rm32 (mov)&quot;</span><span class="Delimiter">);</span>
 <span id="L530" class="LineNr">530 </span>
-<span id="L531" class="LineNr">531 </span><span class="Delimiter">:(scenario decrement_rm32)</span>
-<span id="L532" class="LineNr">532 </span><span class="Special">% Reg[EAX].u = 0x20;</span>
-<span id="L533" class="LineNr">533 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L531" class="LineNr">531 </span><span class="Delimiter">:(scenario copy_r32_to_r32)</span>
+<span id="L532" class="LineNr">532 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
+<span id="L533" class="LineNr">533 </span>== <span class="Constant">0x1</span>
 <span id="L534" class="LineNr">534 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L535" class="LineNr">535 </span>  ff  c8                                      <span class="Comment"># decrement EAX</span>
-<span id="L536" class="LineNr">536 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (subop inc) 000 (EAX)</span>
-<span id="L537" class="LineNr">537 </span><span class="traceContains">+run: decrement r/m32</span>
+<span id="L535" class="LineNr">535 </span>  <span class="Constant">89</span>  d8                                      <span class="Comment"># copy EBX to EAX</span>
+<span id="L536" class="LineNr">536 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L537" class="LineNr">537 </span><span class="traceContains">+run: copy <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
 <span id="L538" class="LineNr">538 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L539" class="LineNr">539 </span><span class="traceContains">+run: storing value 0x0000001f</span>
+<span id="L539" class="LineNr">539 </span><span class="traceContains">+run: storing 0x000000af</span>
 <span id="L540" class="LineNr">540 </span>
-<span id="L541" class="LineNr">541 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
-<span id="L542" class="LineNr">542 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r/m32</span>
-<span id="L543" class="LineNr">543 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L544" class="LineNr">544 </span>  <span class="Normal">int32_t</span>* <a href='001help.cc.html#L15'>arg</a> = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L545" class="LineNr">545 </span>  --*arg<span class="Delimiter">;</span>
-<span id="L546" class="LineNr">546 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L547" class="LineNr">547 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L548" class="LineNr">548 </span><span class="Delimiter">}</span>
-<span id="L549" class="LineNr">549 </span>
-<span id="L550" class="LineNr">550 </span><span class="SalientComment">//:: push</span>
+<span id="L541" class="LineNr">541 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L542" class="LineNr">542 </span><span class="Normal">case</span> <span class="Constant">0x89</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r32 to r/m32</span>
+<span id="L543" class="LineNr">543 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
+<span id="L544" class="LineNr">544 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rsrc = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L545" class="LineNr">545 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L546" class="LineNr">546 </span>  <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L547" class="LineNr">547 </span>  *dest = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rsrc]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L548" class="LineNr">548 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *dest &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L549" class="LineNr">549 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L550" class="LineNr">550 </span><span class="Delimiter">}</span>
 <span id="L551" class="LineNr">551 </span>
-<span id="L552" class="LineNr">552 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L553" class="LineNr">553 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L13'>EAX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L554" class="LineNr">554 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L14'>ECX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L555" class="LineNr">555 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L15'>EDX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L556" class="LineNr">556 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L16'>EBX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L557" class="LineNr">557 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L17'>ESP</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L558" class="LineNr">558 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L18'>EBP</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L559" class="LineNr">559 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L19'>ESI</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L560" class="LineNr">560 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L20'>EDI</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L561" class="LineNr">561 </span>
-<span id="L562" class="LineNr">562 </span><span class="Delimiter">:(scenario push_r32)</span>
-<span id="L563" class="LineNr">563 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L564" class="LineNr">564 </span><span class="Special">% Reg[EBX].i = 0x0000000a;</span>
-<span id="L565" class="LineNr">565 </span>== <span class="Constant">0x1</span>
-<span id="L566" class="LineNr">566 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L567" class="LineNr">567 </span>  <span class="Constant">53</span>                                          <span class="Comment"># push EBX to stack</span>
-<span id="L568" class="LineNr">568 </span><span class="traceContains">+run: <a href='012elf.cc.html#L89'>push</a> <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L569" class="LineNr">569 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span>
-<span id="L570" class="LineNr">570 </span><span class="traceContains">+run: pushing value 0x0000000a</span>
-<span id="L571" class="LineNr">571 </span>
-<span id="L572" class="LineNr">572 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L573" class="LineNr">573 </span><span class="Normal">case</span> <span class="Constant">0x50</span>:
-<span id="L574" class="LineNr">574 </span><span class="Normal">case</span> <span class="Constant">0x51</span>:
-<span id="L575" class="LineNr">575 </span><span class="Normal">case</span> <span class="Constant">0x52</span>:
-<span id="L576" class="LineNr">576 </span><span class="Normal">case</span> <span class="Constant">0x53</span>:
-<span id="L577" class="LineNr">577 </span><span class="Normal">case</span> <span class="Constant">0x54</span>:
-<span id="L578" class="LineNr">578 </span><span class="Normal">case</span> <span class="Constant">0x55</span>:
-<span id="L579" class="LineNr">579 </span><span class="Normal">case</span> <span class="Constant">0x56</span>:
-<span id="L580" class="LineNr">580 </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="L581" class="LineNr">581 </span>  <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L582" class="LineNr">582 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L583" class="LineNr">583 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: &quot; &lt;&lt; NUM(reg) &lt;&lt; &quot;: &quot; &lt;&lt; Reg[reg].u &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
-<span id="L584" class="LineNr">584 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L585" class="LineNr">585 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L586" class="LineNr">586 </span><span class="Delimiter">}</span>
-<span id="L587" class="LineNr">587 </span>
-<span id="L588" class="LineNr">588 </span><span class="SalientComment">//:: pop</span>
-<span id="L589" class="LineNr">589 </span>
-<span id="L590" class="LineNr">590 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L591" class="LineNr">591 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L13'>EAX</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L592" class="LineNr">592 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L14'>ECX</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L593" class="LineNr">593 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L15'>EDX</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L594" class="LineNr">594 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L16'>EBX</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L595" class="LineNr">595 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L17'>ESP</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L596" class="LineNr">596 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L18'>EBP</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L597" class="LineNr">597 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L19'>ESI</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L598" class="LineNr">598 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L20'>EDI</a> (pop)&quot;</span><span class="Delimiter">);</span>
-<span id="L599" class="LineNr">599 </span>
-<span id="L600" class="LineNr">600 </span><span class="Delimiter">:(scenario pop_r32)</span>
-<span id="L601" class="LineNr">601 </span><span class="Special">% Reg[ESP].u = 0x02000000;</span>
-<span id="L602" class="LineNr">602 </span><span class="Special">% Mem.push_back(vma(0x02000000));  // manually allocate memory</span>
-<span id="L603" class="LineNr">603 </span><span class="Special">% write_mem_i32(0x02000000, 0x0000000a);  // ..before this write</span>
-<span id="L604" class="LineNr">604 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L605" class="LineNr">605 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L606" class="LineNr">606 </span>  5b                                          <span class="Comment"># pop stack to EBX</span>
-<span id="L607" class="LineNr">607 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L608" class="LineNr">608 </span>0a <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0x0a</span>
-<span id="L609" class="LineNr">609 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L630'>pop</a> into <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L610" class="LineNr">610 </span><span class="traceContains">+run: popping value 0x0000000a</span>
-<span id="L611" class="LineNr">611 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x02000004</span>
-<span id="L612" class="LineNr">612 </span>
-<span id="L613" class="LineNr">613 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L614" class="LineNr">614 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
-<span id="L615" class="LineNr">615 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
-<span id="L616" class="LineNr">616 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
-<span id="L617" class="LineNr">617 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
-<span id="L618" class="LineNr">618 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
-<span id="L619" class="LineNr">619 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
-<span id="L620" class="LineNr">620 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
-<span id="L621" class="LineNr">621 </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="L622" class="LineNr">622 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L623" class="LineNr">623 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L624" class="LineNr">624 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;pop from &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
-<span id="L625" class="LineNr">625 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L630'>pop</a><span class="Delimiter">();</span>
-<span id="L626" class="LineNr">626 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;=&gt; &quot; &lt;&lt; NUM(reg) &lt;&lt; &quot;: &quot; &lt;&lt; Reg[reg].u &lt;&lt; '\n';</span>
-<span id="L627" class="LineNr">627 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L628" class="LineNr">628 </span><span class="Delimiter">}</span>
-<span id="L629" class="LineNr">629 </span><span class="Delimiter">:(code)</span>
-<span id="L630" class="LineNr">630 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L630'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L631" class="LineNr">631 </span>  <span class="Normal">const</span> <span class="Normal">uint32_t</span> result = <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L632" class="LineNr">632 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;popping value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; result &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L633" class="LineNr">633 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L634" class="LineNr">634 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L635" class="LineNr">635 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L636" class="LineNr">636 </span><span class="Delimiter">}</span>
+<span id="L552" class="LineNr">552 </span><span class="SalientComment">//:: xchg</span>
+<span id="L553" class="LineNr">553 </span>
+<span id="L554" class="LineNr">554 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L555" class="LineNr">555 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;swap the <a href='003trace.cc.html#L74'>contents</a> of r32 and rm32 (xchg)&quot;</span><span class="Delimiter">);</span>
+<span id="L556" class="LineNr">556 </span>
+<span id="L557" class="LineNr">557 </span><span class="Delimiter">:(scenario xchg_r32_with_r32)</span>
+<span id="L558" class="LineNr">558 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
+<span id="L559" class="LineNr">559 </span><span class="Special">% Reg[EAX].i = 0x2e;</span>
+<span id="L560" class="LineNr">560 </span>== <span class="Constant">0x1</span>
+<span id="L561" class="LineNr">561 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L562" class="LineNr">562 </span>  <span class="Constant">87</span>  d8                                      <span class="Comment"># exchange EBX with EAX</span>
+<span id="L563" class="LineNr">563 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L564" class="LineNr">564 </span><span class="traceContains">+run: exchange <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L565" class="LineNr">565 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L566" class="LineNr">566 </span><span class="traceContains">+run: storing 0x000000af in r/m32</span>
+<span id="L567" class="LineNr">567 </span><span class="traceContains">+run: storing 0x0000002e in <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L568" class="LineNr">568 </span>
+<span id="L569" class="LineNr">569 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L570" class="LineNr">570 </span><span class="Normal">case</span> <span class="Constant">0x87</span>: <span class="Delimiter">{</span>  <span class="Comment">// exchange r32 with r/m32</span>
+<span id="L571" class="LineNr">571 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
+<span id="L572" class="LineNr">572 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> reg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L573" class="LineNr">573 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;exchange &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L574" class="LineNr">574 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L575" class="LineNr">575 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp = *arg1<span class="Delimiter">;</span>
+<span id="L576" class="LineNr">576 </span>  *arg1 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L577" class="LineNr">577 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i = tmp<span class="Delimiter">;</span>
+<span id="L578" class="LineNr">578 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <span class="Constant">&quot; in r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L579" class="LineNr">579 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg2]<span class="Delimiter">.</span>i &lt;&lt; <span class="Constant">&quot; in &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L580" class="LineNr">580 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L581" class="LineNr">581 </span><span class="Delimiter">}</span>
+<span id="L582" class="LineNr">582 </span>
+<span id="L583" class="LineNr">583 </span><span class="SalientComment">//:: increment</span>
+<span id="L584" class="LineNr">584 </span>
+<span id="L585" class="LineNr">585 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L586" class="LineNr">586 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;40&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L13'>EAX</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L587" class="LineNr">587 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;41&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L14'>ECX</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L588" class="LineNr">588 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;42&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L15'>EDX</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L589" class="LineNr">589 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;43&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L16'>EBX</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L590" class="LineNr">590 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;44&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L17'>ESP</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L591" class="LineNr">591 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;45&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L18'>EBP</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L592" class="LineNr">592 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;46&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L19'>ESI</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L593" class="LineNr">593 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;47&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment <a href='010---vm.cc.html#L20'>EDI</a> (inc)&quot;</span><span class="Delimiter">);</span>
+<span id="L594" class="LineNr">594 </span>
+<span id="L595" class="LineNr">595 </span><span class="Delimiter">:(scenario increment_r32)</span>
+<span id="L596" class="LineNr">596 </span><span class="Special">% Reg[ECX].u = 0x1f;</span>
+<span id="L597" class="LineNr">597 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L598" class="LineNr">598 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L599" class="LineNr">599 </span>  <span class="Constant">41</span>                                          <span class="Comment"># increment ECX</span>
+<span id="L600" class="LineNr">600 </span><span class="traceContains">+run: increment <a href='010---vm.cc.html#L14'>ECX</a></span>
+<span id="L601" class="LineNr">601 </span><span class="traceContains">+run: storing value 0x00000020</span>
+<span id="L602" class="LineNr">602 </span>
+<span id="L603" class="LineNr">603 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L604" class="LineNr">604 </span><span class="Normal">case</span> <span class="Constant">0x40</span>:
+<span id="L605" class="LineNr">605 </span><span class="Normal">case</span> <span class="Constant">0x41</span>:
+<span id="L606" class="LineNr">606 </span><span class="Normal">case</span> <span class="Constant">0x42</span>:
+<span id="L607" class="LineNr">607 </span><span class="Normal">case</span> <span class="Constant">0x43</span>:
+<span id="L608" class="LineNr">608 </span><span class="Normal">case</span> <span class="Constant">0x44</span>:
+<span id="L609" class="LineNr">609 </span><span class="Normal">case</span> <span class="Constant">0x45</span>:
+<span id="L610" class="LineNr">610 </span><span class="Normal">case</span> <span class="Constant">0x46</span>:
+<span id="L611" class="LineNr">611 </span><span class="Normal">case</span> <span class="Constant">0x47</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r32</span>
+<span id="L612" class="LineNr">612 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L613" class="LineNr">613 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L614" class="LineNr">614 </span>  ++<span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L615" class="LineNr">615 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L616" class="LineNr">616 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L617" class="LineNr">617 </span><span class="Delimiter">}</span>
+<span id="L618" class="LineNr">618 </span>
+<span id="L619" class="LineNr">619 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L620" class="LineNr">620 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment/decrement/jump/push/call rm32 based on subop (inc/dec/jmp/push/call)&quot;</span><span class="Delimiter">);</span>
+<span id="L621" class="LineNr">621 </span>
+<span id="L622" class="LineNr">622 </span><span class="Delimiter">:(scenario increment_rm32)</span>
+<span id="L623" class="LineNr">623 </span><span class="Special">% Reg[EAX].u = 0x20;</span>
+<span id="L624" class="LineNr">624 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L625" class="LineNr">625 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L626" class="LineNr">626 </span>  ff  c0                                      <span class="Comment"># increment EAX</span>
+<span id="L627" class="LineNr">627 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 000 (subop inc) 000 (EAX)</span>
+<span id="L628" class="LineNr">628 </span><span class="traceContains">+run: increment r/m32</span>
+<span id="L629" class="LineNr">629 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L630" class="LineNr">630 </span><span class="traceContains">+run: storing value 0x00000021</span>
+<span id="L631" class="LineNr">631 </span>
+<span id="L632" class="LineNr">632 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L633" class="LineNr">633 </span><span class="Normal">case</span> <span class="Constant">0xff</span>: <span class="Delimiter">{</span>
+<span id="L634" class="LineNr">634 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
+<span id="L635" class="LineNr">635 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
+<span id="L636" class="LineNr">636 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L637" class="LineNr">637 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r/m32</span>
+<span id="L638" class="LineNr">638 </span>      <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L639" class="LineNr">639 </span>      <span class="Normal">int32_t</span>* <a href='001help.cc.html#L15'>arg</a> = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L640" class="LineNr">640 </span>      ++*arg<span class="Delimiter">;</span>
+<span id="L641" class="LineNr">641 </span>      <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L642" class="LineNr">642 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L643" class="LineNr">643 </span>    <span class="Delimiter">}</span>
+<span id="L644" class="LineNr">644 </span>    <span class="Normal">default</span>:
+<span id="L645" class="LineNr">645 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for ff: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L412'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L646" class="LineNr">646 </span>      <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L647" class="LineNr">647 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L648" class="LineNr">648 </span>    <span class="Comment">// End Op ff Subops</span>
+<span id="L649" class="LineNr">649 </span>  <span class="Delimiter">}</span>
+<span id="L650" class="LineNr">650 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L651" class="LineNr">651 </span><span class="Delimiter">}</span>
+<span id="L652" class="LineNr">652 </span>
+<span id="L653" class="LineNr">653 </span><span class="SalientComment">//:: decrement</span>
+<span id="L654" class="LineNr">654 </span>
+<span id="L655" class="LineNr">655 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L656" class="LineNr">656 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;48&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L13'>EAX</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L657" class="LineNr">657 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;49&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L14'>ECX</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L658" class="LineNr">658 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L15'>EDX</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L659" class="LineNr">659 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L16'>EBX</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L660" class="LineNr">660 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L17'>ESP</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L661" class="LineNr">661 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L18'>EBP</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L662" class="LineNr">662 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L19'>ESI</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L663" class="LineNr">663 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement <a href='010---vm.cc.html#L20'>EDI</a> (dec)&quot;</span><span class="Delimiter">);</span>
+<span id="L664" class="LineNr">664 </span>
+<span id="L665" class="LineNr">665 </span><span class="Delimiter">:(scenario decrement_r32)</span>
+<span id="L666" class="LineNr">666 </span><span class="Special">% Reg[ECX].u = 0x1f;</span>
+<span id="L667" class="LineNr">667 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L668" class="LineNr">668 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L669" class="LineNr">669 </span>  <span class="Constant">49</span>                                          <span class="Comment"># decrement ECX</span>
+<span id="L670" class="LineNr">670 </span><span class="traceContains">+run: decrement <a href='010---vm.cc.html#L14'>ECX</a></span>
+<span id="L671" class="LineNr">671 </span><span class="traceContains">+run: storing value 0x0000001e</span>
+<span id="L672" class="LineNr">672 </span>
+<span id="L673" class="LineNr">673 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L674" class="LineNr">674 </span><span class="Normal">case</span> <span class="Constant">0x48</span>:
+<span id="L675" class="LineNr">675 </span><span class="Normal">case</span> <span class="Constant">0x49</span>:
+<span id="L676" class="LineNr">676 </span><span class="Normal">case</span> <span class="Constant">0x4a</span>:
+<span id="L677" class="LineNr">677 </span><span class="Normal">case</span> <span class="Constant">0x4b</span>:
+<span id="L678" class="LineNr">678 </span><span class="Normal">case</span> <span class="Constant">0x4c</span>:
+<span id="L679" class="LineNr">679 </span><span class="Normal">case</span> <span class="Constant">0x4d</span>:
+<span id="L680" class="LineNr">680 </span><span class="Normal">case</span> <span class="Constant">0x4e</span>:
+<span id="L681" class="LineNr">681 </span><span class="Normal">case</span> <span class="Constant">0x4f</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r32</span>
+<span id="L682" class="LineNr">682 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L683" class="LineNr">683 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L684" class="LineNr">684 </span>  --<span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L685" class="LineNr">685 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L686" class="LineNr">686 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L687" class="LineNr">687 </span><span class="Delimiter">}</span>
+<span id="L688" class="LineNr">688 </span>
+<span id="L689" class="LineNr">689 </span><span class="Delimiter">:(scenario decrement_rm32)</span>
+<span id="L690" class="LineNr">690 </span><span class="Special">% Reg[EAX].u = 0x20;</span>
+<span id="L691" class="LineNr">691 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L692" class="LineNr">692 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L693" class="LineNr">693 </span>  ff  c8                                      <span class="Comment"># decrement EAX</span>
+<span id="L694" class="LineNr">694 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (subop inc) 000 (EAX)</span>
+<span id="L695" class="LineNr">695 </span><span class="traceContains">+run: decrement r/m32</span>
+<span id="L696" class="LineNr">696 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L697" class="LineNr">697 </span><span class="traceContains">+run: storing value 0x0000001f</span>
+<span id="L698" class="LineNr">698 </span>
+<span id="L699" class="LineNr">699 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
+<span id="L700" class="LineNr">700 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r/m32</span>
+<span id="L701" class="LineNr">701 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L702" class="LineNr">702 </span>  <span class="Normal">int32_t</span>* <a href='001help.cc.html#L15'>arg</a> = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L703" class="LineNr">703 </span>  --*arg<span class="Delimiter">;</span>
+<span id="L704" class="LineNr">704 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L705" class="LineNr">705 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L706" class="LineNr">706 </span><span class="Delimiter">}</span>
+<span id="L707" class="LineNr">707 </span>
+<span id="L708" class="LineNr">708 </span><span class="SalientComment">//:: push</span>
+<span id="L709" class="LineNr">709 </span>
+<span id="L710" class="LineNr">710 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L711" class="LineNr">711 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L13'>EAX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L712" class="LineNr">712 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L14'>ECX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L713" class="LineNr">713 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L15'>EDX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L714" class="LineNr">714 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L16'>EBX</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L715" class="LineNr">715 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L17'>ESP</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L716" class="LineNr">716 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L18'>EBP</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L717" class="LineNr">717 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L19'>ESI</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L718" class="LineNr">718 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='010---vm.cc.html#L20'>EDI</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L719" class="LineNr">719 </span>
+<span id="L720" class="LineNr">720 </span><span class="Delimiter">:(scenario push_r32)</span>
+<span id="L721" class="LineNr">721 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
+<span id="L722" class="LineNr">722 </span><span class="Special">% Reg[EBX].i = 0x0000000a;</span>
+<span id="L723" class="LineNr">723 </span>== <span class="Constant">0x1</span>
+<span id="L724" class="LineNr">724 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L725" class="LineNr">725 </span>  <span class="Constant">53</span>                                          <span class="Comment"># push EBX to stack</span>
+<span id="L726" class="LineNr">726 </span><span class="traceContains">+run: <a href='012elf.cc.html#L89'>push</a> <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L727" class="LineNr">727 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span>
+<span id="L728" class="LineNr">728 </span><span class="traceContains">+run: pushing value 0x0000000a</span>
+<span id="L729" class="LineNr">729 </span>
+<span id="L730" class="LineNr">730 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L731" class="LineNr">731 </span><span class="Normal">case</span> <span class="Constant">0x50</span>:
+<span id="L732" class="LineNr">732 </span><span class="Normal">case</span> <span class="Constant">0x51</span>:
+<span id="L733" class="LineNr">733 </span><span class="Normal">case</span> <span class="Constant">0x52</span>:
+<span id="L734" class="LineNr">734 </span><span class="Normal">case</span> <span class="Constant">0x53</span>:
+<span id="L735" class="LineNr">735 </span><span class="Normal">case</span> <span class="Constant">0x54</span>:
+<span id="L736" class="LineNr">736 </span><span class="Normal">case</span> <span class="Constant">0x55</span>:
+<span id="L737" class="LineNr">737 </span><span class="Normal">case</span> <span class="Constant">0x56</span>:
+<span id="L738" class="LineNr">738 </span><span class="Normal">case</span> <span class="Constant">0x57</span>: <span class="Delimiter">{</span>  <span class="Comment">// push r32 to stack</span>
+<span id="L739" class="LineNr">739 </span>  <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L740" class="LineNr">740 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L741" class="LineNr">741 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: &quot; &lt;&lt; NUM(reg) &lt;&lt; &quot;: &quot; &lt;&lt; Reg[reg].u &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
+<span id="L742" class="LineNr">742 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L743" class="LineNr">743 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L744" class="LineNr">744 </span><span class="Delimiter">}</span>
+<span id="L745" class="LineNr">745 </span>
+<span id="L746" class="LineNr">746 </span><span class="SalientComment">//:: pop</span>
+<span id="L747" class="LineNr">747 </span>
+<span id="L748" class="LineNr">748 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L749" class="LineNr">749 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L13'>EAX</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L750" class="LineNr">750 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L14'>ECX</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L751" class="LineNr">751 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L15'>EDX</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L752" class="LineNr">752 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L16'>EBX</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L753" class="LineNr">753 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L17'>ESP</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L754" class="LineNr">754 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L18'>EBP</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L755" class="LineNr">755 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L19'>ESI</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L756" class="LineNr">756 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L20'>EDI</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L757" class="LineNr">757 </span>
+<span id="L758" class="LineNr">758 </span><span class="Delimiter">:(scenario pop_r32)</span>
+<span id="L759" class="LineNr">759 </span><span class="Special">% Reg[ESP].u = 0x02000000;</span>
+<span id="L760" class="LineNr">760 </span><span class="Special">% Mem.push_back(vma(0x02000000));  // manually allocate memory</span>
+<span id="L761" class="LineNr">761 </span><span class="Special">% write_mem_i32(0x02000000, 0x0000000a);  // ..before this write</span>
+<span id="L762" class="LineNr">762 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L763" class="LineNr">763 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L764" class="LineNr">764 </span>  5b                                          <span class="Comment"># pop stack to EBX</span>
+<span id="L765" class="LineNr">765 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
+<span id="L766" class="LineNr">766 </span>0a <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0x0a</span>
+<span id="L767" class="LineNr">767 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L788'>pop</a> into <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L768" class="LineNr">768 </span><span class="traceContains">+run: popping value 0x0000000a</span>
+<span id="L769" class="LineNr">769 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x02000004</span>
+<span id="L770" class="LineNr">770 </span>
+<span id="L771" class="LineNr">771 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L772" class="LineNr">772 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
+<span id="L773" class="LineNr">773 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
+<span id="L774" class="LineNr">774 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
+<span id="L775" class="LineNr">775 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
+<span id="L776" class="LineNr">776 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
+<span id="L777" class="LineNr">777 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
+<span id="L778" class="LineNr">778 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
+<span id="L779" class="LineNr">779 </span><span class="Normal">case</span> <span class="Constant">0x5f</span>: <span class="Delimiter">{</span>  <span class="Comment">// pop stack into r32</span>
+<span id="L780" class="LineNr">780 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L781" class="LineNr">781 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L782" class="LineNr">782 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;pop from &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
+<span id="L783" class="LineNr">783 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[reg]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L788'>pop</a><span class="Delimiter">();</span>
+<span id="L784" class="LineNr">784 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;=&gt; &quot; &lt;&lt; NUM(reg) &lt;&lt; &quot;: &quot; &lt;&lt; Reg[reg].u &lt;&lt; '\n';</span>
+<span id="L785" class="LineNr">785 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L786" class="LineNr">786 </span><span class="Delimiter">}</span>
+<span id="L787" class="LineNr">787 </span><span class="Delimiter">:(code)</span>
+<span id="L788" class="LineNr">788 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L788'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L789" class="LineNr">789 </span>  <span class="Normal">const</span> <span class="Normal">uint32_t</span> result = <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L790" class="LineNr">790 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;popping value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; result &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L791" class="LineNr">791 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L792" class="LineNr">792 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L793" class="LineNr">793 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L794" class="LineNr">794 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/014indirect_addressing.cc.html b/html/subx/014indirect_addressing.cc.html
index 433dce9e..0a272f9a 100644
--- a/html/subx/014indirect_addressing.cc.html
+++ b/html/subx/014indirect_addressing.cc.html
@@ -515,7 +515,7 @@ if ('onhashchange' in window) {
 <span id="L448" class="LineNr">448 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (pop r/m32) 000 (dest EAX)</span>
 <span id="L449" class="LineNr">449 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
 <span id="L450" class="LineNr">450 </span><span class="Constant">30</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0x30</span>
-<span id="L451" class="LineNr">451 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L630'>pop</a> into r/m32</span>
+<span id="L451" class="LineNr">451 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L788'>pop</a> into r/m32</span>
 <span id="L452" class="LineNr">452 </span><span class="traceContains">+run: effective address is 0x00000060 (EAX)</span>
 <span id="L453" class="LineNr">453 </span><span class="traceContains">+run: popping value 0x00000030</span>
 <span id="L454" class="LineNr">454 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00002004</span>
@@ -528,7 +528,7 @@ if ('onhashchange' in window) {
 <span id="L461" class="LineNr">461 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>
 <span id="L462" class="LineNr">462 </span>      <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L463" class="LineNr">463 </span>      <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L464" class="LineNr">464 </span>      *dest = <a href='013direct_addressing.cc.html#L630'>pop</a><span class="Delimiter">();</span>
+<span id="L464" class="LineNr">464 </span>      *dest = <a href='013direct_addressing.cc.html#L788'>pop</a><span class="Delimiter">();</span>
 <span id="L465" class="LineNr">465 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L466" class="LineNr">466 </span>    <span class="Delimiter">}</span>
 <span id="L467" class="LineNr">467 </span>  <span class="Delimiter">}</span>
diff --git a/html/subx/015immediate_addressing.cc.html b/html/subx/015immediate_addressing.cc.html
index 5fd4d6c7..edf0fbec 100644
--- a/html/subx/015immediate_addressing.cc.html
+++ b/html/subx/015immediate_addressing.cc.html
@@ -177,390 +177,541 @@ if ('onhashchange' in window) {
 <span id="L110" class="LineNr">110 </span><span class="traceContains">+run: subop subtract</span>
 <span id="L111" class="LineNr">111 </span><span class="traceContains">+run: storing 0x00000009</span>
 <span id="L112" class="LineNr">112 </span>
-<span id="L113" class="LineNr">113 </span><span class="SalientComment">//:: and</span>
+<span id="L113" class="LineNr">113 </span><span class="SalientComment">//:: shift left</span>
 <span id="L114" class="LineNr">114 </span>
 <span id="L115" class="LineNr">115 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L116" class="LineNr">116 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise AND of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (and)&quot;</span><span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c1&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;shift rm32 by imm8 bits depending on subop (sal/sar/shl/shr)&quot;</span><span class="Delimiter">);</span>
 <span id="L117" class="LineNr">117 </span>
-<span id="L118" class="LineNr">118 </span><span class="Delimiter">:(scenario and_imm32_with_eax)</span>
-<span id="L119" class="LineNr">119 </span><span class="Special">% Reg[EAX].i = 0xff;</span>
+<span id="L118" class="LineNr">118 </span><span class="Delimiter">:(scenario shift_left_r32_with_imm8)</span>
+<span id="L119" class="LineNr">119 </span><span class="Special">% Reg[EBX].i = 13;</span>
 <span id="L120" class="LineNr">120 </span>== <span class="Constant">0x1</span>
 <span id="L121" class="LineNr">121 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Constant">25</span>                              0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EAX</span>
-<span id="L123" class="LineNr">123 </span><span class="traceContains">+run: and imm32 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L124" class="LineNr">124 </span><span class="traceContains">+run: storing 0x0000000a</span>
-<span id="L125" class="LineNr">125 </span>
-<span id="L126" class="LineNr">126 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L127" class="LineNr">127 </span><span class="Normal">case</span> <span class="Constant">0x25</span>: <span class="Delimiter">{</span>  <span class="Comment">// and imm32 with EAX</span>
-<span id="L128" class="LineNr">128 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L129" class="LineNr">129 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L130" class="LineNr">130 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L131" class="LineNr">131 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L132" class="LineNr">132 </span><span class="Delimiter">}</span>
-<span id="L133" class="LineNr">133 </span>
-<span id="L134" class="LineNr">134 </span><span class="Comment">//:</span>
-<span id="L135" class="LineNr">135 </span>
-<span id="L136" class="LineNr">136 </span><span class="Delimiter">:(scenario and_imm32_with_mem_at_r32)</span>
-<span id="L137" class="LineNr">137 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
-<span id="L138" class="LineNr">138 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L139" class="LineNr">139 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L140" class="LineNr">140 </span>  <span class="Constant">81</span>  <span class="Constant">23</span>                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with *EBX</span>
-<span id="L141" class="LineNr">141 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 100 (and imm32) 011 (dest EBX)</span>
-<span id="L142" class="LineNr">142 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L143" class="LineNr">143 </span>ff <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0xff</span>
-<span id="L144" class="LineNr">144 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
-<span id="L145" class="LineNr">145 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L146" class="LineNr">146 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
-<span id="L147" class="LineNr">147 </span><span class="traceContains">+run: subop and</span>
-<span id="L148" class="LineNr">148 </span><span class="traceContains">+run: storing 0x0000000a</span>
-<span id="L149" class="LineNr">149 </span>
-<span id="L150" class="LineNr">150 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L151" class="LineNr">151 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>
-<span id="L152" class="LineNr">152 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop and&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L153" class="LineNr">153 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L155" class="LineNr">155 </span><span class="Delimiter">}</span>
-<span id="L156" class="LineNr">156 </span>
-<span id="L157" class="LineNr">157 </span><span class="Comment">//:</span>
+<span id="L122" class="LineNr">122 </span>  c1  e3                          <span class="PreProc">0</span><span class="Constant">1</span>          <span class="Comment"># negate EBX</span>
+<span id="L123" class="LineNr">123 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (subop shift left) 011 (dest EBX)</span>
+<span id="L124" class="LineNr">124 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L125" class="LineNr">125 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L126" class="LineNr">126 </span><span class="traceContains">+run: subop: shift left by CL bits</span>
+<span id="L127" class="LineNr">127 </span><span class="traceContains">+run: storing 0x0000001a</span>
+<span id="L128" class="LineNr">128 </span>
+<span id="L129" class="LineNr">129 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L130" class="LineNr">130 </span><span class="Normal">case</span> <span class="Constant">0xc1</span>: <span class="Delimiter">{</span>
+<span id="L131" class="LineNr">131 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
+<span id="L132" class="LineNr">132 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;operate on r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L133" class="LineNr">133 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L134" class="LineNr">134 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L136" class="LineNr">136 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift left r/m32 by CL</span>
+<span id="L137" class="LineNr">137 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift left by CL bits&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L138" class="LineNr">138 </span>    <span class="Normal">uint8_t</span> count = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">()</span> &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
+<span id="L139" class="LineNr">139 </span>    <span class="Comment">// OF is only defined if count is 1</span>
+<span id="L140" class="LineNr">140 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L141" class="LineNr">141 </span>      <span class="Normal">bool</span> msb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x80000000</span><span class="Delimiter">)</span> &gt;&gt; <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L142" class="LineNr">142 </span>      <span class="Normal">bool</span> pnsb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x40000000</span><span class="Delimiter">);</span>
+<span id="L143" class="LineNr">143 </span>      <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>msb != pnsb<span class="Delimiter">);</span>
+<span id="L144" class="LineNr">144 </span>    <span class="Delimiter">}</span>
+<span id="L145" class="LineNr">145 </span>    *arg1 = <span class="Delimiter">(</span>*arg1 &lt;&lt; count<span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span>    ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L147" class="LineNr">147 </span>    SF = <span class="Delimiter">(</span>*arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L148" class="LineNr">148 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L149" class="LineNr">149 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Delimiter">}</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Comment">// End Op c1 Subops</span>
+<span id="L152" class="LineNr">152 </span>  <span class="Normal">default</span>:
+<span id="L153" class="LineNr">153 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after c1: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L154" class="LineNr">154 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><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 and_imm32_with_r32)</span>
-<span id="L160" class="LineNr">160 </span><span class="Special">% Reg[EBX].i = 0xff;</span>
-<span id="L161" class="LineNr">161 </span>== <span class="Constant">0x1</span>
-<span id="L162" class="LineNr">162 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L163" class="LineNr">163 </span>  <span class="Constant">81</span>  e3                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EBX</span>
-<span id="L164" class="LineNr">164 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (and imm32) 011 (dest EBX)</span>
-<span id="L165" class="LineNr">165 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
-<span id="L166" class="LineNr">166 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L167" class="LineNr">167 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
-<span id="L168" class="LineNr">168 </span><span class="traceContains">+run: subop and</span>
-<span id="L169" class="LineNr">169 </span><span class="traceContains">+run: storing 0x0000000a</span>
-<span id="L170" class="LineNr">170 </span>
-<span id="L171" class="LineNr">171 </span><span class="SalientComment">//:: or</span>
-<span id="L172" class="LineNr">172 </span>
-<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L174" class="LineNr">174 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise OR of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (or)&quot;</span><span class="Delimiter">);</span>
-<span id="L175" class="LineNr">175 </span>
-<span id="L176" class="LineNr">176 </span><span class="Delimiter">:(scenario or_imm32_with_eax)</span>
-<span id="L177" class="LineNr">177 </span><span class="Special">% Reg[EAX].i = 0xd0c0b0a0;</span>
-<span id="L178" class="LineNr">178 </span>== <span class="Constant">0x1</span>
-<span id="L179" class="LineNr">179 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L180" class="LineNr">180 </span>  0d                              0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EAX</span>
-<span id="L181" class="LineNr">181 </span><span class="traceContains">+run: or imm32 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L182" class="LineNr">182 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L183" class="LineNr">183 </span>
-<span id="L184" class="LineNr">184 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L185" class="LineNr">185 </span><span class="Normal">case</span> <span class="Constant">0x0d</span>: <span class="Delimiter">{</span>  <span class="Comment">// or imm32 with EAX</span>
-<span id="L186" class="LineNr">186 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L187" class="LineNr">187 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L188" class="LineNr">188 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L189" class="LineNr">189 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L190" class="LineNr">190 </span><span class="Delimiter">}</span>
-<span id="L191" class="LineNr">191 </span>
-<span id="L192" class="LineNr">192 </span><span class="Comment">//:</span>
-<span id="L193" class="LineNr">193 </span>
-<span id="L194" class="LineNr">194 </span><span class="Delimiter">:(scenario or_imm32_with_mem_at_r32)</span>
-<span id="L195" class="LineNr">195 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
-<span id="L196" class="LineNr">196 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L197" class="LineNr">197 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L198" class="LineNr">198 </span>  <span class="Constant">81</span>  0b                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with *EBX</span>
-<span id="L199" class="LineNr">199 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 001 (or imm32) 011 (dest EBX)</span>
-<span id="L200" class="LineNr">200 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L201" class="LineNr">201 </span>a0 b0 c0 d0  <span class="Comment"># 0xd0c0b0a0</span>
-<span id="L202" class="LineNr">202 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
-<span id="L203" class="LineNr">203 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L204" class="LineNr">204 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
-<span id="L205" class="LineNr">205 </span><span class="traceContains">+run: subop or</span>
-<span id="L206" class="LineNr">206 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L207" class="LineNr">207 </span>
-<span id="L208" class="LineNr">208 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L209" class="LineNr">209 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>
-<span id="L210" class="LineNr">210 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop or&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L211" class="LineNr">211 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L212" class="LineNr">212 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L213" class="LineNr">213 </span><span class="Delimiter">}</span>
-<span id="L214" class="LineNr">214 </span>
-<span id="L215" class="LineNr">215 </span><span class="Delimiter">:(scenario or_imm32_with_r32)</span>
-<span id="L216" class="LineNr">216 </span><span class="Special">% Reg[EBX].i = 0xd0c0b0a0;</span>
-<span id="L217" class="LineNr">217 </span>== <span class="Constant">0x1</span>
-<span id="L218" class="LineNr">218 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L219" class="LineNr">219 </span>  <span class="Constant">81</span>  cb                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EBX</span>
-<span id="L220" class="LineNr">220 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (or imm32) 011 (dest EBX)</span>
-<span id="L221" class="LineNr">221 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
-<span id="L222" class="LineNr">222 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L223" class="LineNr">223 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
-<span id="L224" class="LineNr">224 </span><span class="traceContains">+run: subop or</span>
-<span id="L225" class="LineNr">225 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L226" class="LineNr">226 </span>
-<span id="L227" class="LineNr">227 </span><span class="SalientComment">//:: xor</span>
-<span id="L228" class="LineNr">228 </span>
-<span id="L229" class="LineNr">229 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L230" class="LineNr">230 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise XOR of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (xor)&quot;</span><span class="Delimiter">);</span>
-<span id="L231" class="LineNr">231 </span>
-<span id="L232" class="LineNr">232 </span><span class="Delimiter">:(scenario xor_imm32_with_eax)</span>
-<span id="L233" class="LineNr">233 </span><span class="Special">% Reg[EAX].i = 0xddccb0a0;</span>
-<span id="L234" class="LineNr">234 </span>== <span class="Constant">0x1</span>
-<span id="L235" class="LineNr">235 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L236" class="LineNr">236 </span>  <span class="Constant">35</span>                              0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EAX</span>
-<span id="L237" class="LineNr">237 </span><span class="traceContains">+run: xor imm32 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L238" class="LineNr">238 </span><span class="traceContains">+run: storing 0xd0c0bbaa</span>
-<span id="L239" class="LineNr">239 </span>
-<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L241" class="LineNr">241 </span><span class="Normal">case</span> <span class="Constant">0x35</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor imm32 with EAX</span>
-<span id="L242" class="LineNr">242 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L243" class="LineNr">243 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L244" class="LineNr">244 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L245" class="LineNr">245 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L246" class="LineNr">246 </span><span class="Delimiter">}</span>
-<span id="L247" class="LineNr">247 </span>
-<span id="L248" class="LineNr">248 </span><span class="Comment">//:</span>
-<span id="L249" class="LineNr">249 </span>
-<span id="L250" class="LineNr">250 </span><span class="Delimiter">:(scenario xor_imm32_with_mem_at_r32)</span>
-<span id="L251" class="LineNr">251 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
-<span id="L252" class="LineNr">252 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L253" class="LineNr">253 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L254" class="LineNr">254 </span>  <span class="Constant">81</span>  <span class="Constant">33</span>                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with *EBX</span>
-<span id="L255" class="LineNr">255 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (xor imm32) 011 (dest EBX)</span>
-<span id="L256" class="LineNr">256 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L257" class="LineNr">257 </span>a0 b0 c0 d0  <span class="Comment"># 0xd0c0b0a0</span>
-<span id="L258" class="LineNr">258 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
-<span id="L259" class="LineNr">259 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L260" class="LineNr">260 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
-<span id="L261" class="LineNr">261 </span><span class="traceContains">+run: subop xor</span>
-<span id="L262" class="LineNr">262 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
+<span id="L159" class="LineNr">159 </span><span class="SalientComment">//:: shift right arithmetic</span>
+<span id="L160" class="LineNr">160 </span>
+<span id="L161" class="LineNr">161 </span><span class="Delimiter">:(scenario shift_right_arithmetic_r32_with_imm8)</span>
+<span id="L162" class="LineNr">162 </span><span class="Special">% Reg[EBX].i = 26;</span>
+<span id="L163" class="LineNr">163 </span>== <span class="Constant">0x1</span>
+<span id="L164" class="LineNr">164 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L165" class="LineNr">165 </span>  c1  fb                          <span class="PreProc">0</span><span class="Constant">1</span>          <span class="Comment"># negate EBX</span>
+<span id="L166" class="LineNr">166 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
+<span id="L167" class="LineNr">167 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L168" class="LineNr">168 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L169" class="LineNr">169 </span><span class="traceContains">+run: subop: shift right by CL bits, while preserving sign</span>
+<span id="L170" class="LineNr">170 </span><span class="traceContains">+run: storing 0x0000000d</span>
+<span id="L171" class="LineNr">171 </span>
+<span id="L172" class="LineNr">172 </span><span class="Delimiter">:(before &quot;End Op c1 Subops&quot;)</span>
+<span id="L173" class="LineNr">173 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift right r/m32 by CL, preserving sign</span>
+<span id="L174" class="LineNr">174 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift right by CL bits, while preserving sign&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L175" class="LineNr">175 </span>  <span class="Normal">uint8_t</span> count = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">()</span> &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
+<span id="L176" class="LineNr">176 </span>  *arg1 = <span class="Delimiter">(</span>*arg1 &gt;&gt; count<span class="Delimiter">);</span>
+<span id="L177" class="LineNr">177 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L178" class="LineNr">178 </span>  SF = <span class="Delimiter">(</span>*arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L179" class="LineNr">179 </span>  <span class="Comment">// OF is only defined if count is 1</span>
+<span id="L180" class="LineNr">180 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L181" class="LineNr">181 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L182" class="LineNr">182 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span>
+<span id="L184" class="LineNr">184 </span>
+<span id="L185" class="LineNr">185 </span><span class="Delimiter">:(scenario shift_right_arithmetic_odd_r32_with_imm8)</span>
+<span id="L186" class="LineNr">186 </span><span class="Special">% Reg[EBX].i = 27;</span>
+<span id="L187" class="LineNr">187 </span>== <span class="Constant">0x1</span>
+<span id="L188" class="LineNr">188 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L189" class="LineNr">189 </span>  c1  fb                          <span class="PreProc">0</span><span class="Constant">1</span>          <span class="Comment"># negate EBX</span>
+<span id="L190" class="LineNr">190 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
+<span id="L191" class="LineNr">191 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L192" class="LineNr">192 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L193" class="LineNr">193 </span><span class="traceContains">+run: subop: shift right by CL bits, while preserving sign</span>
+<span id="L194" class="LineNr">194 </span><span class="Comment"># result: 13</span>
+<span id="L195" class="LineNr">195 </span><span class="traceContains">+run: storing 0x0000000d</span>
+<span id="L196" class="LineNr">196 </span>
+<span id="L197" class="LineNr">197 </span><span class="Delimiter">:(scenario shift_right_arithmetic_negative_r32_with_imm8)</span>
+<span id="L198" class="LineNr">198 </span><span class="Special">% Reg[EBX].i = 0xfffffffd;  // -3</span>
+<span id="L199" class="LineNr">199 </span>== <span class="Constant">0x1</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>  c1  fb                          <span class="PreProc">0</span><span class="Constant">1</span>          <span class="Comment"># negate EBX</span>
+<span id="L202" class="LineNr">202 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)</span>
+<span id="L203" class="LineNr">203 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L204" class="LineNr">204 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L205" class="LineNr">205 </span><span class="traceContains">+run: subop: shift right by CL bits, while preserving sign</span>
+<span id="L206" class="LineNr">206 </span><span class="Comment"># result: -2</span>
+<span id="L207" class="LineNr">207 </span><span class="traceContains">+run: storing 0xfffffffe</span>
+<span id="L208" class="LineNr">208 </span>
+<span id="L209" class="LineNr">209 </span><span class="SalientComment">//:: shift right logical</span>
+<span id="L210" class="LineNr">210 </span>
+<span id="L211" class="LineNr">211 </span><span class="Delimiter">:(scenario shift_right_logical_r32_with_imm8)</span>
+<span id="L212" class="LineNr">212 </span><span class="Special">% Reg[EBX].i = 26;</span>
+<span id="L213" class="LineNr">213 </span>== <span class="Constant">0x1</span>
+<span id="L214" class="LineNr">214 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L215" class="LineNr">215 </span>  c1  eb                          <span class="PreProc">0</span><span class="Constant">1</span>          <span class="Comment"># negate EBX</span>
+<span id="L216" class="LineNr">216 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
+<span id="L217" class="LineNr">217 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L218" class="LineNr">218 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L219" class="LineNr">219 </span><span class="traceContains">+run: subop: shift right by CL bits, while padding zeroes</span>
+<span id="L220" class="LineNr">220 </span><span class="traceContains">+run: storing 0x0000000d</span>
+<span id="L221" class="LineNr">221 </span>
+<span id="L222" class="LineNr">222 </span><span class="Delimiter">:(before &quot;End Op c1 Subops&quot;)</span>
+<span id="L223" class="LineNr">223 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>  <span class="Comment">// shift right r/m32 by CL, preserving sign</span>
+<span id="L224" class="LineNr">224 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: shift right by CL bits, while padding zeroes&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L225" class="LineNr">225 </span>  <span class="Normal">uint8_t</span> count = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">()</span> &amp; <span class="Constant">0x1f</span><span class="Delimiter">;</span>
+<span id="L226" class="LineNr">226 </span>  <span class="Comment">// OF is only defined if count is 1</span>
+<span id="L227" class="LineNr">227 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L228" class="LineNr">228 </span>    <span class="Normal">bool</span> msb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x80000000</span><span class="Delimiter">)</span> &gt;&gt; <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L229" class="LineNr">229 </span>    <span class="Normal">bool</span> pnsb = <span class="Delimiter">(</span>*arg1 &amp; <span class="Constant">0x40000000</span><span class="Delimiter">);</span>
+<span id="L230" class="LineNr">230 </span>    <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>msb != pnsb<span class="Delimiter">);</span>
+<span id="L231" class="LineNr">231 </span>  <span class="Delimiter">}</span>
+<span id="L232" class="LineNr">232 </span>  <span class="Normal">uint32_t</span>* uarg1 = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>arg1<span class="Delimiter">);</span>
+<span id="L233" class="LineNr">233 </span>  *uarg1 = <span class="Delimiter">(</span>*uarg1 &gt;&gt; count<span class="Delimiter">);</span>
+<span id="L234" class="LineNr">234 </span>  ZF = <span class="Delimiter">(</span>*uarg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L235" class="LineNr">235 </span>  <span class="Comment">// result is always positive by definition</span>
+<span id="L236" class="LineNr">236 </span>  SF =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L237" class="LineNr">237 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="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 shift_right_logical_odd_r32_with_imm8)</span>
+<span id="L242" class="LineNr">242 </span><span class="Special">% Reg[EBX].i = 27;</span>
+<span id="L243" class="LineNr">243 </span>== <span class="Constant">0x1</span>
+<span id="L244" class="LineNr">244 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L245" class="LineNr">245 </span>  c1  eb                          <span class="PreProc">0</span><span class="Constant">1</span>          <span class="Comment"># negate EBX</span>
+<span id="L246" class="LineNr">246 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
+<span id="L247" class="LineNr">247 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L248" class="LineNr">248 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L249" class="LineNr">249 </span><span class="traceContains">+run: subop: shift right by CL bits, while padding zeroes</span>
+<span id="L250" class="LineNr">250 </span><span class="Comment"># result: 13</span>
+<span id="L251" class="LineNr">251 </span><span class="traceContains">+run: storing 0x0000000d</span>
+<span id="L252" class="LineNr">252 </span>
+<span id="L253" class="LineNr">253 </span><span class="Delimiter">:(scenario shift_right_logical_negative_r32_with_imm8)</span>
+<span id="L254" class="LineNr">254 </span><span class="Special">% Reg[EBX].i = 0xfffffffd;</span>
+<span id="L255" class="LineNr">255 </span>== <span class="Constant">0x1</span>
+<span id="L256" class="LineNr">256 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L257" class="LineNr">257 </span>  c1  eb                          <span class="PreProc">0</span><span class="Constant">1</span>          <span class="Comment"># negate EBX</span>
+<span id="L258" class="LineNr">258 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)</span>
+<span id="L259" class="LineNr">259 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L260" class="LineNr">260 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L261" class="LineNr">261 </span><span class="traceContains">+run: subop: shift right by CL bits, while padding zeroes</span>
+<span id="L262" class="LineNr">262 </span><span class="traceContains">+run: storing 0x7ffffffe</span>
 <span id="L263" class="LineNr">263 </span>
-<span id="L264" class="LineNr">264 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L265" class="LineNr">265 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>
-<span id="L266" class="LineNr">266 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop xor&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L267" class="LineNr">267 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L268" class="LineNr">268 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L269" class="LineNr">269 </span><span class="Delimiter">}</span>
-<span id="L270" class="LineNr">270 </span>
-<span id="L271" class="LineNr">271 </span><span class="Delimiter">:(scenario xor_imm32_with_r32)</span>
-<span id="L272" class="LineNr">272 </span><span class="Special">% Reg[EBX].i = 0xd0c0b0a0;</span>
-<span id="L273" class="LineNr">273 </span>== <span class="Constant">0x1</span>
-<span id="L274" class="LineNr">274 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L275" class="LineNr">275 </span>  <span class="Constant">81</span>  f3                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EBX</span>
-<span id="L276" class="LineNr">276 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 110 (xor imm32) 011 (dest EBX)</span>
-<span id="L277" class="LineNr">277 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
-<span id="L278" class="LineNr">278 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L279" class="LineNr">279 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
-<span id="L280" class="LineNr">280 </span><span class="traceContains">+run: subop xor</span>
-<span id="L281" class="LineNr">281 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L282" class="LineNr">282 </span>
-<span id="L283" class="LineNr">283 </span><span class="SalientComment">//:: compare (cmp)</span>
+<span id="L264" class="LineNr">264 </span><span class="SalientComment">//:: and</span>
+<span id="L265" class="LineNr">265 </span>
+<span id="L266" class="LineNr">266 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L267" class="LineNr">267 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise AND of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (and)&quot;</span><span class="Delimiter">);</span>
+<span id="L268" class="LineNr">268 </span>
+<span id="L269" class="LineNr">269 </span><span class="Delimiter">:(scenario and_imm32_with_eax)</span>
+<span id="L270" class="LineNr">270 </span><span class="Special">% Reg[EAX].i = 0xff;</span>
+<span id="L271" class="LineNr">271 </span>== <span class="Constant">0x1</span>
+<span id="L272" class="LineNr">272 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L273" class="LineNr">273 </span>  <span class="Constant">25</span>                              0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EAX</span>
+<span id="L274" class="LineNr">274 </span><span class="traceContains">+run: and imm32 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L275" class="LineNr">275 </span><span class="traceContains">+run: storing 0x0000000a</span>
+<span id="L276" class="LineNr">276 </span>
+<span id="L277" class="LineNr">277 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L278" class="LineNr">278 </span><span class="Normal">case</span> <span class="Constant">0x25</span>: <span class="Delimiter">{</span>  <span class="Comment">// and imm32 with EAX</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L280" class="LineNr">280 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L281" class="LineNr">281 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L282" class="LineNr">282 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L283" class="LineNr">283 </span><span class="Delimiter">}</span>
 <span id="L284" class="LineNr">284 </span>
-<span id="L285" class="LineNr">285 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L286" class="LineNr">286 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if <a href='010---vm.cc.html#L13'>EAX</a> &lt; imm32 (cmp)&quot;</span><span class="Delimiter">);</span>
-<span id="L287" class="LineNr">287 </span>
-<span id="L288" class="LineNr">288 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_greater)</span>
-<span id="L289" class="LineNr">289 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b0a;</span>
-<span id="L290" class="LineNr">290 </span>== <span class="Constant">0x1</span>
-<span id="L291" class="LineNr">291 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L292" class="LineNr">292 </span>  3d                              <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with EAX</span>
-<span id="L293" class="LineNr">293 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x0d0c0b07</span>
-<span id="L294" class="LineNr">294 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L295" class="LineNr">295 </span>
-<span id="L296" class="LineNr">296 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L297" class="LineNr">297 </span><span class="Normal">case</span> <span class="Constant">0x3d</span>: <span class="Delimiter">{</span>  <span class="Comment">// compare EAX with imm32</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg1 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L300" class="LineNr">300 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L301" class="LineNr">301 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span>
-<span id="L302" class="LineNr">302 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L303" class="LineNr">303 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L304" class="LineNr">304 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = arg1 - arg2<span class="Delimiter">;</span>
-<span id="L305" class="LineNr">305 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L306" class="LineNr">306 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L307" class="LineNr">307 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L308" class="LineNr">308 </span><span class="Delimiter">}</span>
+<span id="L285" class="LineNr">285 </span><span class="Comment">//:</span>
+<span id="L286" class="LineNr">286 </span>
+<span id="L287" class="LineNr">287 </span><span class="Delimiter">:(scenario and_imm32_with_mem_at_r32)</span>
+<span id="L288" class="LineNr">288 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
+<span id="L289" class="LineNr">289 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
+<span id="L290" class="LineNr">290 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L291" class="LineNr">291 </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="L292" class="LineNr">292 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 100 (and imm32) 011 (dest EBX)</span>
+<span id="L293" class="LineNr">293 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
+<span id="L294" class="LineNr">294 </span>ff <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0xff</span>
+<span id="L295" class="LineNr">295 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L296" class="LineNr">296 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
+<span id="L297" class="LineNr">297 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L298" class="LineNr">298 </span><span class="traceContains">+run: subop and</span>
+<span id="L299" class="LineNr">299 </span><span class="traceContains">+run: storing 0x0000000a</span>
+<span id="L300" class="LineNr">300 </span>
+<span id="L301" class="LineNr">301 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
+<span id="L302" class="LineNr">302 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>
+<span id="L303" class="LineNr">303 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop and&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L304" class="LineNr">304 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L305" class="LineNr">305 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L306" class="LineNr">306 </span><span class="Delimiter">}</span>
+<span id="L307" class="LineNr">307 </span>
+<span id="L308" class="LineNr">308 </span><span class="Comment">//:</span>
 <span id="L309" class="LineNr">309 </span>
-<span id="L310" class="LineNr">310 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_lesser)</span>
-<span id="L311" class="LineNr">311 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b07;</span>
+<span id="L310" class="LineNr">310 </span><span class="Delimiter">:(scenario and_imm32_with_r32)</span>
+<span id="L311" class="LineNr">311 </span><span class="Special">% Reg[EBX].i = 0xff;</span>
 <span id="L312" class="LineNr">312 </span>== <span class="Constant">0x1</span>
 <span id="L313" class="LineNr">313 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L314" class="LineNr">314 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX</span>
-<span id="L315" class="LineNr">315 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x0d0c0b0a</span>
-<span id="L316" class="LineNr">316 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L317" class="LineNr">317 </span>
-<span id="L318" class="LineNr">318 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_equal)</span>
-<span id="L319" class="LineNr">319 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b0a;</span>
-<span id="L320" class="LineNr">320 </span>== <span class="Constant">0x1</span>
-<span id="L321" class="LineNr">321 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L322" class="LineNr">322 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX</span>
-<span id="L323" class="LineNr">323 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x0d0c0b0a</span>
-<span id="L324" class="LineNr">324 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L325" class="LineNr">325 </span>
-<span id="L326" class="LineNr">326 </span><span class="Comment">//:</span>
-<span id="L327" class="LineNr">327 </span>
-<span id="L328" class="LineNr">328 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_greater)</span>
-<span id="L329" class="LineNr">329 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b0a;</span>
-<span id="L330" class="LineNr">330 </span>== <span class="Constant">0x1</span>
-<span id="L331" class="LineNr">331 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L332" class="LineNr">332 </span>  <span class="Constant">81</span>  fb                          <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with EBX</span>
-<span id="L333" class="LineNr">333 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L334" class="LineNr">334 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
-<span id="L335" class="LineNr">335 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L336" class="LineNr">336 </span><span class="traceContains">+run: imm32 is 0x0d0c0b07</span>
-<span id="L337" class="LineNr">337 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L338" class="LineNr">338 </span>
-<span id="L339" class="LineNr">339 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L340" class="LineNr">340 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>
-<span id="L341" class="LineNr">341 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop compare&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L342" class="LineNr">342 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L343" class="LineNr">343 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L344" class="LineNr">344 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L345" class="LineNr">345 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L346" class="LineNr">346 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L347" class="LineNr">347 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L348" class="LineNr">348 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L349" class="LineNr">349 </span><span class="Delimiter">}</span>
-<span id="L350" class="LineNr">350 </span>
-<span id="L351" class="LineNr">351 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_lesser)</span>
-<span id="L352" class="LineNr">352 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b07;</span>
-<span id="L353" class="LineNr">353 </span>== <span class="Constant">0x1</span>
-<span id="L354" class="LineNr">354 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L355" class="LineNr">355 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX</span>
-<span id="L356" class="LineNr">356 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L357" class="LineNr">357 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
-<span id="L358" class="LineNr">358 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L359" class="LineNr">359 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
-<span id="L360" class="LineNr">360 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L361" class="LineNr">361 </span>
-<span id="L362" class="LineNr">362 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_equal)</span>
-<span id="L363" class="LineNr">363 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b0a;</span>
-<span id="L364" class="LineNr">364 </span>== <span class="Constant">0x1</span>
-<span id="L365" class="LineNr">365 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L366" class="LineNr">366 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX</span>
-<span id="L367" class="LineNr">367 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L368" class="LineNr">368 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
-<span id="L369" class="LineNr">369 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L370" class="LineNr">370 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
-<span id="L371" class="LineNr">371 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L372" class="LineNr">372 </span>
-<span id="L373" class="LineNr">373 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_greater)</span>
-<span id="L374" class="LineNr">374 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
-<span id="L375" class="LineNr">375 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L376" class="LineNr">376 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L377" class="LineNr">377 </span>  <span class="Constant">81</span>  3b                          <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with *EBX</span>
-<span id="L378" class="LineNr">378 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L379" class="LineNr">379 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L380" class="LineNr">380 </span>0a 0b 0c 0d  <span class="Comment"># 0x0d0c0b0a</span>
-<span id="L381" class="LineNr">381 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
-<span id="L382" class="LineNr">382 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L383" class="LineNr">383 </span><span class="traceContains">+run: imm32 is 0x0d0c0b07</span>
-<span id="L384" class="LineNr">384 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L385" class="LineNr">385 </span>
-<span id="L386" class="LineNr">386 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_lesser)</span>
-<span id="L387" class="LineNr">387 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
-<span id="L388" class="LineNr">388 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L389" class="LineNr">389 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L390" class="LineNr">390 </span>  <span class="Constant">81</span>  3b                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with *EBX</span>
-<span id="L391" class="LineNr">391 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L392" class="LineNr">392 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L393" class="LineNr">393 </span><span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># 0x0d0c0b07</span>
-<span id="L394" class="LineNr">394 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
-<span id="L395" class="LineNr">395 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L396" class="LineNr">396 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
-<span id="L397" class="LineNr">397 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
+<span id="L314" class="LineNr">314 </span>  <span class="Constant">81</span>  e3                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EBX</span>
+<span id="L315" class="LineNr">315 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (and imm32) 011 (dest EBX)</span>
+<span id="L316" class="LineNr">316 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L317" class="LineNr">317 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L318" class="LineNr">318 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L319" class="LineNr">319 </span><span class="traceContains">+run: subop and</span>
+<span id="L320" class="LineNr">320 </span><span class="traceContains">+run: storing 0x0000000a</span>
+<span id="L321" class="LineNr">321 </span>
+<span id="L322" class="LineNr">322 </span><span class="SalientComment">//:: or</span>
+<span id="L323" class="LineNr">323 </span>
+<span id="L324" class="LineNr">324 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L325" class="LineNr">325 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise OR of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (or)&quot;</span><span class="Delimiter">);</span>
+<span id="L326" class="LineNr">326 </span>
+<span id="L327" class="LineNr">327 </span><span class="Delimiter">:(scenario or_imm32_with_eax)</span>
+<span id="L328" class="LineNr">328 </span><span class="Special">% Reg[EAX].i = 0xd0c0b0a0;</span>
+<span id="L329" class="LineNr">329 </span>== <span class="Constant">0x1</span>
+<span id="L330" class="LineNr">330 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L331" class="LineNr">331 </span>  0d                              0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EAX</span>
+<span id="L332" class="LineNr">332 </span><span class="traceContains">+run: or imm32 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L333" class="LineNr">333 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
+<span id="L334" class="LineNr">334 </span>
+<span id="L335" class="LineNr">335 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L336" class="LineNr">336 </span><span class="Normal">case</span> <span class="Constant">0x0d</span>: <span class="Delimiter">{</span>  <span class="Comment">// or imm32 with EAX</span>
+<span id="L337" class="LineNr">337 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L338" class="LineNr">338 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L339" class="LineNr">339 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L340" class="LineNr">340 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L341" class="LineNr">341 </span><span class="Delimiter">}</span>
+<span id="L342" class="LineNr">342 </span>
+<span id="L343" class="LineNr">343 </span><span class="Comment">//:</span>
+<span id="L344" class="LineNr">344 </span>
+<span id="L345" class="LineNr">345 </span><span class="Delimiter">:(scenario or_imm32_with_mem_at_r32)</span>
+<span id="L346" class="LineNr">346 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
+<span id="L347" class="LineNr">347 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
+<span id="L348" class="LineNr">348 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L349" class="LineNr">349 </span>  <span class="Constant">81</span>  0b                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with *EBX</span>
+<span id="L350" class="LineNr">350 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 001 (or imm32) 011 (dest EBX)</span>
+<span id="L351" class="LineNr">351 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
+<span id="L352" class="LineNr">352 </span>a0 b0 c0 d0  <span class="Comment"># 0xd0c0b0a0</span>
+<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L354" class="LineNr">354 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
+<span id="L355" class="LineNr">355 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L356" class="LineNr">356 </span><span class="traceContains">+run: subop or</span>
+<span id="L357" class="LineNr">357 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
+<span id="L358" class="LineNr">358 </span>
+<span id="L359" class="LineNr">359 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
+<span id="L360" class="LineNr">360 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>
+<span id="L361" class="LineNr">361 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop or&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L362" class="LineNr">362 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L363" class="LineNr">363 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L364" class="LineNr">364 </span><span class="Delimiter">}</span>
+<span id="L365" class="LineNr">365 </span>
+<span id="L366" class="LineNr">366 </span><span class="Delimiter">:(scenario or_imm32_with_r32)</span>
+<span id="L367" class="LineNr">367 </span><span class="Special">% Reg[EBX].i = 0xd0c0b0a0;</span>
+<span id="L368" class="LineNr">368 </span>== <span class="Constant">0x1</span>
+<span id="L369" class="LineNr">369 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L370" class="LineNr">370 </span>  <span class="Constant">81</span>  cb                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EBX</span>
+<span id="L371" class="LineNr">371 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (or imm32) 011 (dest EBX)</span>
+<span id="L372" class="LineNr">372 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L373" class="LineNr">373 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L374" class="LineNr">374 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L375" class="LineNr">375 </span><span class="traceContains">+run: subop or</span>
+<span id="L376" class="LineNr">376 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
+<span id="L377" class="LineNr">377 </span>
+<span id="L378" class="LineNr">378 </span><span class="SalientComment">//:: xor</span>
+<span id="L379" class="LineNr">379 </span>
+<span id="L380" class="LineNr">380 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L381" class="LineNr">381 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise XOR of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (xor)&quot;</span><span class="Delimiter">);</span>
+<span id="L382" class="LineNr">382 </span>
+<span id="L383" class="LineNr">383 </span><span class="Delimiter">:(scenario xor_imm32_with_eax)</span>
+<span id="L384" class="LineNr">384 </span><span class="Special">% Reg[EAX].i = 0xddccb0a0;</span>
+<span id="L385" class="LineNr">385 </span>== <span class="Constant">0x1</span>
+<span id="L386" class="LineNr">386 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L387" class="LineNr">387 </span>  <span class="Constant">35</span>                              0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EAX</span>
+<span id="L388" class="LineNr">388 </span><span class="traceContains">+run: xor imm32 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L389" class="LineNr">389 </span><span class="traceContains">+run: storing 0xd0c0bbaa</span>
+<span id="L390" class="LineNr">390 </span>
+<span id="L391" class="LineNr">391 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L392" class="LineNr">392 </span><span class="Normal">case</span> <span class="Constant">0x35</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor imm32 with EAX</span>
+<span id="L393" class="LineNr">393 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L394" class="LineNr">394 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L395" class="LineNr">395 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L396" class="LineNr">396 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L397" class="LineNr">397 </span><span class="Delimiter">}</span>
 <span id="L398" class="LineNr">398 </span>
-<span id="L399" class="LineNr">399 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_equal)</span>
-<span id="L400" class="LineNr">400 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b0a;</span>
-<span id="L401" class="LineNr">401 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
-<span id="L402" class="LineNr">402 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L403" class="LineNr">403 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L404" class="LineNr">404 </span>  <span class="Constant">81</span>  3b                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with *EBX</span>
-<span id="L405" class="LineNr">405 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L406" class="LineNr">406 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L407" class="LineNr">407 </span>0a 0b 0c 0d  <span class="Comment"># 0x0d0c0b0a</span>
-<span id="L408" class="LineNr">408 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
-<span id="L409" class="LineNr">409 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L410" class="LineNr">410 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
-<span id="L411" class="LineNr">411 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L412" class="LineNr">412 </span>
-<span id="L413" class="LineNr">413 </span><span class="SalientComment">//:: copy (mov)</span>
+<span id="L399" class="LineNr">399 </span><span class="Comment">//:</span>
+<span id="L400" class="LineNr">400 </span>
+<span id="L401" class="LineNr">401 </span><span class="Delimiter">:(scenario xor_imm32_with_mem_at_r32)</span>
+<span id="L402" class="LineNr">402 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
+<span id="L403" class="LineNr">403 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
+<span id="L404" class="LineNr">404 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L405" class="LineNr">405 </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="L406" class="LineNr">406 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (xor imm32) 011 (dest EBX)</span>
+<span id="L407" class="LineNr">407 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
+<span id="L408" class="LineNr">408 </span>a0 b0 c0 d0  <span class="Comment"># 0xd0c0b0a0</span>
+<span id="L409" class="LineNr">409 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L410" class="LineNr">410 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
+<span id="L411" class="LineNr">411 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L412" class="LineNr">412 </span><span class="traceContains">+run: subop xor</span>
+<span id="L413" class="LineNr">413 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
 <span id="L414" class="LineNr">414 </span>
-<span id="L415" class="LineNr">415 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L416" class="LineNr">416 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L13'>EAX</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L417" class="LineNr">417 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L14'>ECX</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L418" class="LineNr">418 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L15'>EDX</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L419" class="LineNr">419 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L16'>EBX</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L420" class="LineNr">420 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L17'>ESP</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L421" class="LineNr">421 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L18'>EBP</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L422" class="LineNr">422 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L19'>ESI</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L423" class="LineNr">423 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L20'>EDI</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L424" class="LineNr">424 </span>
-<span id="L425" class="LineNr">425 </span><span class="Delimiter">:(scenario copy_imm32_to_r32)</span>
-<span id="L426" class="LineNr">426 </span>== <span class="Constant">0x1</span>
-<span id="L427" class="LineNr">427 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L428" class="LineNr">428 </span>  bb                              0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to EBX</span>
-<span id="L429" class="LineNr">429 </span><span class="traceContains">+run: copy imm32 0x0d0c0b0a to <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L430" class="LineNr">430 </span>
-<span id="L431" class="LineNr">431 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L432" class="LineNr">432 </span><span class="Normal">case</span> <span class="Constant">0xb8</span>:
-<span id="L433" class="LineNr">433 </span><span class="Normal">case</span> <span class="Constant">0xb9</span>:
-<span id="L434" class="LineNr">434 </span><span class="Normal">case</span> <span class="Constant">0xba</span>:
-<span id="L435" class="LineNr">435 </span><span class="Normal">case</span> <span class="Constant">0xbb</span>:
-<span id="L436" class="LineNr">436 </span><span class="Normal">case</span> <span class="Constant">0xbc</span>:
-<span id="L437" class="LineNr">437 </span><span class="Normal">case</span> <span class="Constant">0xbd</span>:
-<span id="L438" class="LineNr">438 </span><span class="Normal">case</span> <span class="Constant">0xbe</span>:
-<span id="L439" class="LineNr">439 </span><span class="Normal">case</span> <span class="Constant">0xbf</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
-<span id="L440" class="LineNr">440 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L441" class="LineNr">441 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L442" class="LineNr">442 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; src &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L443" class="LineNr">443 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rdest]<span class="Delimiter">.</span>i = src<span class="Delimiter">;</span>
-<span id="L444" class="LineNr">444 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L445" class="LineNr">445 </span><span class="Delimiter">}</span>
+<span id="L415" class="LineNr">415 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
+<span id="L416" class="LineNr">416 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>
+<span id="L417" class="LineNr">417 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop xor&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L418" class="LineNr">418 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L419" class="LineNr">419 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L420" class="LineNr">420 </span><span class="Delimiter">}</span>
+<span id="L421" class="LineNr">421 </span>
+<span id="L422" class="LineNr">422 </span><span class="Delimiter">:(scenario xor_imm32_with_r32)</span>
+<span id="L423" class="LineNr">423 </span><span class="Special">% Reg[EBX].i = 0xd0c0b0a0;</span>
+<span id="L424" class="LineNr">424 </span>== <span class="Constant">0x1</span>
+<span id="L425" class="LineNr">425 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L426" class="LineNr">426 </span>  <span class="Constant">81</span>  f3                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EBX</span>
+<span id="L427" class="LineNr">427 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 110 (xor imm32) 011 (dest EBX)</span>
+<span id="L428" class="LineNr">428 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L429" class="LineNr">429 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L430" class="LineNr">430 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L431" class="LineNr">431 </span><span class="traceContains">+run: subop xor</span>
+<span id="L432" class="LineNr">432 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
+<span id="L433" class="LineNr">433 </span>
+<span id="L434" class="LineNr">434 </span><span class="SalientComment">//:: compare (cmp)</span>
+<span id="L435" class="LineNr">435 </span>
+<span id="L436" class="LineNr">436 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L437" class="LineNr">437 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if <a href='010---vm.cc.html#L13'>EAX</a> &lt; imm32 (cmp)&quot;</span><span class="Delimiter">);</span>
+<span id="L438" class="LineNr">438 </span>
+<span id="L439" class="LineNr">439 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_greater)</span>
+<span id="L440" class="LineNr">440 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b0a;</span>
+<span id="L441" class="LineNr">441 </span>== <span class="Constant">0x1</span>
+<span id="L442" class="LineNr">442 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L443" class="LineNr">443 </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="L444" class="LineNr">444 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x0d0c0b07</span>
+<span id="L445" class="LineNr">445 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
 <span id="L446" class="LineNr">446 </span>
-<span id="L447" class="LineNr">447 </span><span class="Comment">//:</span>
-<span id="L448" class="LineNr">448 </span>
-<span id="L449" class="LineNr">449 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L450" class="LineNr">450 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to rm32 (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L451" class="LineNr">451 </span>
-<span id="L452" class="LineNr">452 </span><span class="Delimiter">:(scenario copy_imm32_to_mem_at_r32)</span>
-<span id="L453" class="LineNr">453 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
-<span id="L454" class="LineNr">454 </span>== <span class="Constant">0x1</span>
-<span id="L455" class="LineNr">455 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L456" class="LineNr">456 </span>  c7  <span class="PreProc">0</span><span class="Constant">3</span>                          0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to *EBX</span>
-<span id="L457" class="LineNr">457 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (unused) 011 (dest EBX)</span>
-<span id="L458" class="LineNr">458 </span><span class="traceContains">+run: copy imm32 to r/m32</span>
-<span id="L459" class="LineNr">459 </span><span class="traceContains">+run: effective address is 0x00000060 (EBX)</span>
-<span id="L460" class="LineNr">460 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
-<span id="L461" class="LineNr">461 </span>
-<span id="L462" class="LineNr">462 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L463" class="LineNr">463 </span><span class="Normal">case</span> <span class="Constant">0xc7</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
-<span id="L464" class="LineNr">464 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
-<span id="L465" class="LineNr">465 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L466" class="LineNr">466 </span>  <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L467" class="LineNr">467 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L468" class="LineNr">468 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; src &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L469" class="LineNr">469 </span>  *dest = src<span class="Delimiter">;</span>
-<span id="L470" class="LineNr">470 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L471" class="LineNr">471 </span><span class="Delimiter">}</span>
-<span id="L472" class="LineNr">472 </span>
-<span id="L473" class="LineNr">473 </span><span class="SalientComment">//:: push</span>
-<span id="L474" class="LineNr">474 </span>
-<span id="L475" class="LineNr">475 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L476" class="LineNr">476 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push imm32 to stack (push)&quot;</span><span class="Delimiter">);</span>
-<span id="L477" class="LineNr">477 </span>
-<span id="L478" class="LineNr">478 </span><span class="Delimiter">:(scenario push_imm32)</span>
-<span id="L479" class="LineNr">479 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
-<span id="L480" class="LineNr">480 </span>== <span class="Constant">0x1</span>
-<span id="L481" class="LineNr">481 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L482" class="LineNr">482 </span>  <span class="Constant">68</span>                              af <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># push *EAX to stack</span>
-<span id="L483" class="LineNr">483 </span><span class="traceContains">+run: <a href='012elf.cc.html#L89'>push</a> imm32 0x000000af</span>
-<span id="L484" class="LineNr">484 </span><span class="traceContains">+run: <a href='010---vm.cc.html#L17'>ESP</a> is now 0x00000010</span>
-<span id="L485" class="LineNr">485 </span><span class="traceContains">+run: <a href='003trace.cc.html#L74'>contents</a> at <a href='010---vm.cc.html#L17'>ESP</a>: 0x000000af</span>
-<span id="L486" class="LineNr">486 </span>
-<span id="L487" class="LineNr">487 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L488" class="LineNr">488 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span>
-<span id="L489" class="LineNr">489 </span>  <span class="Normal">const</span> <span class="Normal">uint32_t</span> val = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L343'>next32</a><span class="Delimiter">());</span>
-<span id="L490" class="LineNr">490 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; val &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L491" class="LineNr">491 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: &quot; &lt;&lt; val &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
-<span id="L492" class="LineNr">492 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
-<span id="L493" class="LineNr">493 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ESP is now 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L494" class="LineNr">494 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;contents at <a href='010---vm.cc.html#L17'>ESP</a>: 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L495" class="LineNr">495 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L496" class="LineNr">496 </span><span class="Delimiter">}</span>
+<span id="L447" class="LineNr">447 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L448" class="LineNr">448 </span><span class="Normal">case</span> <span class="Constant">0x3d</span>: <span class="Delimiter">{</span>  <span class="Comment">// compare EAX with imm32</span>
+<span id="L449" class="LineNr">449 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg1 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L450" class="LineNr">450 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L451" class="LineNr">451 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L452" class="LineNr">452 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span>
+<span id="L453" class="LineNr">453 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L454" class="LineNr">454 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L455" class="LineNr">455 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = arg1 - arg2<span class="Delimiter">;</span>
+<span id="L456" class="LineNr">456 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L457" class="LineNr">457 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L458" class="LineNr">458 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L459" class="LineNr">459 </span><span class="Delimiter">}</span>
+<span id="L460" class="LineNr">460 </span>
+<span id="L461" class="LineNr">461 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_lesser)</span>
+<span id="L462" class="LineNr">462 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b07;</span>
+<span id="L463" class="LineNr">463 </span>== <span class="Constant">0x1</span>
+<span id="L464" class="LineNr">464 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L465" class="LineNr">465 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX</span>
+<span id="L466" class="LineNr">466 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x0d0c0b0a</span>
+<span id="L467" class="LineNr">467 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
+<span id="L468" class="LineNr">468 </span>
+<span id="L469" class="LineNr">469 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_equal)</span>
+<span id="L470" class="LineNr">470 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b0a;</span>
+<span id="L471" class="LineNr">471 </span>== <span class="Constant">0x1</span>
+<span id="L472" class="LineNr">472 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L473" class="LineNr">473 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX</span>
+<span id="L474" class="LineNr">474 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x0d0c0b0a</span>
+<span id="L475" class="LineNr">475 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
+<span id="L476" class="LineNr">476 </span>
+<span id="L477" class="LineNr">477 </span><span class="Comment">//:</span>
+<span id="L478" class="LineNr">478 </span>
+<span id="L479" class="LineNr">479 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_greater)</span>
+<span id="L480" class="LineNr">480 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b0a;</span>
+<span id="L481" class="LineNr">481 </span>== <span class="Constant">0x1</span>
+<span id="L482" class="LineNr">482 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L483" class="LineNr">483 </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="L484" class="LineNr">484 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L485" class="LineNr">485 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L486" class="LineNr">486 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L487" class="LineNr">487 </span><span class="traceContains">+run: imm32 is 0x0d0c0b07</span>
+<span id="L488" class="LineNr">488 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
+<span id="L489" class="LineNr">489 </span>
+<span id="L490" class="LineNr">490 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
+<span id="L491" class="LineNr">491 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>
+<span id="L492" class="LineNr">492 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop compare&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L493" class="LineNr">493 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L494" class="LineNr">494 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L495" class="LineNr">495 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L496" class="LineNr">496 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L497" class="LineNr">497 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L498" class="LineNr">498 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L499" class="LineNr">499 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L500" class="LineNr">500 </span><span class="Delimiter">}</span>
+<span id="L501" class="LineNr">501 </span>
+<span id="L502" class="LineNr">502 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_lesser)</span>
+<span id="L503" class="LineNr">503 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b07;</span>
+<span id="L504" class="LineNr">504 </span>== <span class="Constant">0x1</span>
+<span id="L505" class="LineNr">505 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L506" class="LineNr">506 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX</span>
+<span id="L507" class="LineNr">507 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L508" class="LineNr">508 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L509" class="LineNr">509 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L510" class="LineNr">510 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L511" class="LineNr">511 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
+<span id="L512" class="LineNr">512 </span>
+<span id="L513" class="LineNr">513 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_equal)</span>
+<span id="L514" class="LineNr">514 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b0a;</span>
+<span id="L515" class="LineNr">515 </span>== <span class="Constant">0x1</span>
+<span id="L516" class="LineNr">516 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L517" class="LineNr">517 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX</span>
+<span id="L518" class="LineNr">518 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L519" class="LineNr">519 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L520" class="LineNr">520 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L521" class="LineNr">521 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L522" class="LineNr">522 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
+<span id="L523" class="LineNr">523 </span>
+<span id="L524" class="LineNr">524 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_greater)</span>
+<span id="L525" class="LineNr">525 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
+<span id="L526" class="LineNr">526 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
+<span id="L527" class="LineNr">527 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L528" class="LineNr">528 </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="L529" class="LineNr">529 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L530" class="LineNr">530 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
+<span id="L531" class="LineNr">531 </span>0a 0b 0c 0d  <span class="Comment"># 0x0d0c0b0a</span>
+<span id="L532" class="LineNr">532 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L533" class="LineNr">533 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
+<span id="L534" class="LineNr">534 </span><span class="traceContains">+run: imm32 is 0x0d0c0b07</span>
+<span id="L535" class="LineNr">535 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
+<span id="L536" class="LineNr">536 </span>
+<span id="L537" class="LineNr">537 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_lesser)</span>
+<span id="L538" class="LineNr">538 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
+<span id="L539" class="LineNr">539 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
+<span id="L540" class="LineNr">540 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L541" class="LineNr">541 </span>  <span class="Constant">81</span>  3b                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with *EBX</span>
+<span id="L542" class="LineNr">542 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L543" class="LineNr">543 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
+<span id="L544" class="LineNr">544 </span><span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># 0x0d0c0b07</span>
+<span id="L545" class="LineNr">545 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L546" class="LineNr">546 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
+<span id="L547" class="LineNr">547 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L548" class="LineNr">548 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
+<span id="L549" class="LineNr">549 </span>
+<span id="L550" class="LineNr">550 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_equal)</span>
+<span id="L551" class="LineNr">551 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b0a;</span>
+<span id="L552" class="LineNr">552 </span><span class="Special">% Reg[EBX].i = 0x2000;</span>
+<span id="L553" class="LineNr">553 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
+<span id="L554" class="LineNr">554 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L555" class="LineNr">555 </span>  <span class="Constant">81</span>  3b                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with *EBX</span>
+<span id="L556" class="LineNr">556 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L557" class="LineNr">557 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
+<span id="L558" class="LineNr">558 </span>0a 0b 0c 0d  <span class="Comment"># 0x0d0c0b0a</span>
+<span id="L559" class="LineNr">559 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L560" class="LineNr">560 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
+<span id="L561" class="LineNr">561 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L562" class="LineNr">562 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
+<span id="L563" class="LineNr">563 </span>
+<span id="L564" class="LineNr">564 </span><span class="SalientComment">//:: copy (mov)</span>
+<span id="L565" class="LineNr">565 </span>
+<span id="L566" class="LineNr">566 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L567" class="LineNr">567 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L13'>EAX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L568" class="LineNr">568 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L14'>ECX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L569" class="LineNr">569 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L15'>EDX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L570" class="LineNr">570 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L16'>EBX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L571" class="LineNr">571 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L17'>ESP</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L572" class="LineNr">572 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L18'>EBP</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L573" class="LineNr">573 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L19'>ESI</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L574" class="LineNr">574 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L20'>EDI</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L575" class="LineNr">575 </span>
+<span id="L576" class="LineNr">576 </span><span class="Delimiter">:(scenario copy_imm32_to_r32)</span>
+<span id="L577" class="LineNr">577 </span>== <span class="Constant">0x1</span>
+<span id="L578" class="LineNr">578 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L579" class="LineNr">579 </span>  bb                              0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to EBX</span>
+<span id="L580" class="LineNr">580 </span><span class="traceContains">+run: copy imm32 0x0d0c0b0a to <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L581" class="LineNr">581 </span>
+<span id="L582" class="LineNr">582 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L583" class="LineNr">583 </span><span class="Normal">case</span> <span class="Constant">0xb8</span>:
+<span id="L584" class="LineNr">584 </span><span class="Normal">case</span> <span class="Constant">0xb9</span>:
+<span id="L585" class="LineNr">585 </span><span class="Normal">case</span> <span class="Constant">0xba</span>:
+<span id="L586" class="LineNr">586 </span><span class="Normal">case</span> <span class="Constant">0xbb</span>:
+<span id="L587" class="LineNr">587 </span><span class="Normal">case</span> <span class="Constant">0xbc</span>:
+<span id="L588" class="LineNr">588 </span><span class="Normal">case</span> <span class="Constant">0xbd</span>:
+<span id="L589" class="LineNr">589 </span><span class="Normal">case</span> <span class="Constant">0xbe</span>:
+<span id="L590" class="LineNr">590 </span><span class="Normal">case</span> <span class="Constant">0xbf</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
+<span id="L591" class="LineNr">591 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L592" class="LineNr">592 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L593" class="LineNr">593 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; src &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L594" class="LineNr">594 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rdest]<span class="Delimiter">.</span>i = src<span class="Delimiter">;</span>
+<span id="L595" class="LineNr">595 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L596" class="LineNr">596 </span><span class="Delimiter">}</span>
+<span id="L597" class="LineNr">597 </span>
+<span id="L598" class="LineNr">598 </span><span class="Comment">//:</span>
+<span id="L599" class="LineNr">599 </span>
+<span id="L600" class="LineNr">600 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L601" class="LineNr">601 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to rm32 (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L602" class="LineNr">602 </span>
+<span id="L603" class="LineNr">603 </span><span class="Delimiter">:(scenario copy_imm32_to_mem_at_r32)</span>
+<span id="L604" class="LineNr">604 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
+<span id="L605" class="LineNr">605 </span>== <span class="Constant">0x1</span>
+<span id="L606" class="LineNr">606 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L607" class="LineNr">607 </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="L608" class="LineNr">608 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (unused) 011 (dest EBX)</span>
+<span id="L609" class="LineNr">609 </span><span class="traceContains">+run: copy imm32 to r/m32</span>
+<span id="L610" class="LineNr">610 </span><span class="traceContains">+run: effective address is 0x00000060 (EBX)</span>
+<span id="L611" class="LineNr">611 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L612" class="LineNr">612 </span>
+<span id="L613" class="LineNr">613 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L614" class="LineNr">614 </span><span class="Normal">case</span> <span class="Constant">0xc7</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
+<span id="L615" class="LineNr">615 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
+<span id="L616" class="LineNr">616 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L617" class="LineNr">617 </span>  <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L618" class="LineNr">618 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L619" class="LineNr">619 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; src &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L620" class="LineNr">620 </span>  *dest = src<span class="Delimiter">;</span>
+<span id="L621" class="LineNr">621 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L622" class="LineNr">622 </span><span class="Delimiter">}</span>
+<span id="L623" class="LineNr">623 </span>
+<span id="L624" class="LineNr">624 </span><span class="SalientComment">//:: push</span>
+<span id="L625" class="LineNr">625 </span>
+<span id="L626" class="LineNr">626 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L627" class="LineNr">627 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push imm32 to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L628" class="LineNr">628 </span>
+<span id="L629" class="LineNr">629 </span><span class="Delimiter">:(scenario push_imm32)</span>
+<span id="L630" class="LineNr">630 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
+<span id="L631" class="LineNr">631 </span>== <span class="Constant">0x1</span>
+<span id="L632" class="LineNr">632 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L633" class="LineNr">633 </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="L634" class="LineNr">634 </span><span class="traceContains">+run: <a href='012elf.cc.html#L89'>push</a> imm32 0x000000af</span>
+<span id="L635" class="LineNr">635 </span><span class="traceContains">+run: <a href='010---vm.cc.html#L17'>ESP</a> is now 0x00000010</span>
+<span id="L636" class="LineNr">636 </span><span class="traceContains">+run: <a href='003trace.cc.html#L74'>contents</a> at <a href='010---vm.cc.html#L17'>ESP</a>: 0x000000af</span>
+<span id="L637" class="LineNr">637 </span>
+<span id="L638" class="LineNr">638 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L639" class="LineNr">639 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span>
+<span id="L640" class="LineNr">640 </span>  <span class="Normal">const</span> <span class="Normal">uint32_t</span> val = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L343'>next32</a><span class="Delimiter">());</span>
+<span id="L641" class="LineNr">641 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; val &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L642" class="LineNr">642 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: &quot; &lt;&lt; val &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
+<span id="L643" class="LineNr">643 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
+<span id="L644" class="LineNr">644 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ESP is now 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L645" class="LineNr">645 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;contents at <a href='010---vm.cc.html#L17'>ESP</a>: 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L646" class="LineNr">646 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L647" class="LineNr">647 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/019functions.cc.html b/html/subx/019functions.cc.html
index 9295ee02..ba6c25b6 100644
--- a/html/subx/019functions.cc.html
+++ b/html/subx/019functions.cc.html
@@ -150,7 +150,7 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr">84 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L85" class="LineNr">85 </span><span class="Normal">case</span> <span class="Constant">0xc3</span>: <span class="Delimiter">{</span>  <span class="Comment">// return from a call</span>
 <span id="L86" class="LineNr">86 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;return&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L87" class="LineNr">87 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = <a href='013direct_addressing.cc.html#L630'>pop</a><span class="Delimiter">();</span>
+<span id="L87" class="LineNr">87 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = <a href='013direct_addressing.cc.html#L788'>pop</a><span class="Delimiter">();</span>
 <span id="L88" class="LineNr">88 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L89" class="LineNr">89 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L90" class="LineNr">90 </span><span class="Delimiter">}</span>
diff --git a/html/subx/030---operands.cc.html b/html/subx/030---operands.cc.html
index afe9e115..ad4ef9c1 100644
--- a/html/subx/030---operands.cc.html
+++ b/html/subx/030---operands.cc.html
@@ -83,7 +83,7 @@ if ('onhashchange' in window) {
 <span id="L19" class="LineNr"> 19 </span>  <span class="Constant">&quot;Each operand has a type. An instruction won't have more than one operand of\n&quot;</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Constant">&quot;any type.\n&quot;</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Constant">&quot;Each instruction has some set of allowed operand types. It'll reject others.\n&quot;</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;The complete list of operand <a href='031check_operands.cc.html#L427'>types</a>: mod, subop, r32 (register), rm32\n&quot;</span>
+<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;The complete list of operand <a href='031check_operands.cc.html#L433'>types</a>: mod, subop, r32 (register), rm32\n&quot;</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Constant">&quot;(register or memory), scale, index, base, disp8, disp16, disp32, imm8,\n&quot;</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Constant">&quot;imm32.\n&quot;</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Constant">&quot;Each of these has its own help page. Try reading 'subx help mod' next.\n&quot;</span>
diff --git a/html/subx/031check_operands.cc.html b/html/subx/031check_operands.cc.html
index e6302677..2cab24d2 100644
--- a/html/subx/031check_operands.cc.html
+++ b/html/subx/031check_operands.cc.html
@@ -89,18 +89,18 @@ if ('onhashchange' in window) {
 <span id="L23" class="LineNr"> 23 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L24" class="LineNr"> 24 </span>  <a href='011run.cc.html#L123'>word</a> op = <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L26" class="LineNr"> 26 </span>    <a href='031check_operands.cc.html#L519'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L26" class="LineNr"> 26 </span>    <a href='031check_operands.cc.html#L525'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
 <span id="L27" class="LineNr"> 27 </span>    <span class="Identifier">return</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="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L30" class="LineNr"> 30 </span>    <a href='031check_operands.cc.html#L487'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L30" class="LineNr"> 30 </span>    <a href='031check_operands.cc.html#L493'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
 <span id="L31" class="LineNr"> 31 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L32" class="LineNr"> 32 </span>  <span class="Delimiter">}</span>
 <span id="L33" class="LineNr"> 33 </span>  check_operands<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
 <span id="L34" class="LineNr"> 34 </span><span class="Delimiter">}</span>
 <span id="L35" class="LineNr"> 35 </span>
 <span id="L36" class="LineNr"> 36 </span><a href='011run.cc.html#L123'>word</a> <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L37" class="LineNr"> 37 </span>  op<span class="Delimiter">.</span>data = <a href='031check_operands.cc.html#L552'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
+<span id="L37" class="LineNr"> 37 </span>  op<span class="Delimiter">.</span>data = <a href='031check_operands.cc.html#L558'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
 <span id="L38" class="LineNr"> 38 </span>  <span class="Comment">// opcodes can't be negative</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span>
 <span id="L40" class="LineNr"> 40 </span>    op<span class="Delimiter">.</span>data = op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
@@ -278,356 +278,362 @@ if ('onhashchange' in window) {
 <span id="L212" class="LineNr">212 </span>  <span class="Comment">// pop</span>
 <span id="L213" class="LineNr">213 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
 <span id="L214" class="LineNr">214 </span>
-<span id="L215" class="LineNr">215 </span>  <span class="SalientComment">//// Class O: op, ModR/M and subop (not r32)</span>
+<span id="L215" class="LineNr">215 </span>  <span class="SalientComment">//// Class N: op, ModR/M and subop (not r32)</span>
 <span id="L216" class="LineNr">216 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
 <span id="L217" class="LineNr">217 </span>  <span class="Comment">//  0     0     0      |0       0     1     1</span>
-<span id="L218" class="LineNr">218 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// test/not/mul/div</span>
-<span id="L219" class="LineNr">219 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// jump/push/call</span>
-<span id="L220" class="LineNr">220 </span>
-<span id="L221" class="LineNr">221 </span>  <span class="SalientComment">//// Class N: op, ModR/M and imm32</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L223" class="LineNr">223 </span>  <span class="Comment">//  1     0     0      |0       0     0     1</span>
-<span id="L224" class="LineNr">224 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x41</span><span class="Delimiter">);</span>  <span class="Comment">// copy</span>
-<span id="L225" class="LineNr">225 </span>
-<span id="L226" class="LineNr">226 </span>  <span class="SalientComment">//// Class P: op, ModR/M, subop (not r32) and imm32</span>
-<span id="L227" class="LineNr">227 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L228" class="LineNr">228 </span>  <span class="Comment">//  1     0     0      |0       0     1     1</span>
-<span id="L229" class="LineNr">229 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
-<span id="L230" class="LineNr">230 </span>
-<span id="L231" class="LineNr">231 </span>  <span class="Comment">// End Init Permitted Operands</span>
-<span id="L232" class="LineNr">232 </span><span class="Delimiter">}</span>
-<span id="L233" class="LineNr">233 </span>
-<span id="L234" class="LineNr">234 </span><span class="Delimiter">:(code)</span>
-<span id="L235" class="LineNr">235 </span><span class="Comment">#define HAS(bitvector, bit)  ((bitvector) &amp; (1 &lt;&lt; (bit)))</span>
-<span id="L236" class="LineNr">236 </span><span class="Comment">#define SET(bitvector, bit)  ((bitvector) | (1 &lt;&lt; (bit)))</span>
-<span id="L237" class="LineNr">237 </span><span class="Comment">#define CLEAR(bitvector, bit)  ((bitvector) &amp; (~(1 &lt;&lt; (bit))))</span>
-<span id="L238" class="LineNr">238 </span>
-<span id="L239" class="LineNr">239 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L240" class="LineNr">240 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L241" class="LineNr">241 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L242" class="LineNr">242 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L243" class="LineNr">243 </span>    <a href='031check_operands.cc.html#L337'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L244" class="LineNr">244 </span>    <a href='031check_operands.cc.html#L364'>compare_bitvector_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L245" class="LineNr">245 </span>  <span class="Delimiter">}</span>
-<span id="L246" class="LineNr">246 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L247" class="LineNr">247 </span>    <a href='031check_operands.cc.html#L253'>compare_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L248" class="LineNr">248 </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="Comment">//: Many instructions can be checked just by comparing bitvectors.</span>
-<span id="L252" class="LineNr">252 </span>
-<span id="L253" class="LineNr">253 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L253'>compare_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L254" class="LineNr">254 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L288'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L255" class="LineNr">255 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L279'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L256" class="LineNr">256 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L257" class="LineNr">257 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
-<span id="L258" class="LineNr">258 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L259" class="LineNr">259 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
-<span id="L260" class="LineNr">260 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
-<span id="L261" class="LineNr">261 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L69'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L262" class="LineNr">262 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
-<span id="L263" class="LineNr">263 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L271'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L264" class="LineNr">264 </span>    <span class="Normal">else</span>
-<span id="L265" class="LineNr">265 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L271'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L266" class="LineNr">266 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L267" class="LineNr">267 </span>  <span class="Delimiter">}</span>
-<span id="L268" class="LineNr">268 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L269" class="LineNr">269 </span><span class="Delimiter">}</span>
-<span id="L270" class="LineNr">270 </span>
-<span id="L271" class="LineNr">271 </span>string <a href='031check_operands.cc.html#L271'>maybe_name</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L272" class="LineNr">272 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L273" class="LineNr">273 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L274" class="LineNr">274 </span>  <span class="Comment">// strip stuff in parens from the name</span>
-<span id="L275" class="LineNr">275 </span>  <span class="Normal">const</span> string&amp; s = get<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L276" class="LineNr">276 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot; (&quot;</span><span class="Delimiter">))</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
-<span id="L277" class="LineNr">277 </span><span class="Delimiter">}</span>
-<span id="L278" class="LineNr">278 </span>
-<span id="L279" class="LineNr">279 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L279'>compute_operand_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L280" class="LineNr">280 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L281" class="LineNr">281 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L282" class="LineNr">282 </span>    bitvector = bitvector | <a href='031check_operands.cc.html#L305'>bitvector_for_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L283" class="LineNr">283 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L90'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L284" class="LineNr">284 </span>  <span class="Delimiter">}</span>
-<span id="L285" class="LineNr">285 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
-<span id="L286" class="LineNr">286 </span><span class="Delimiter">}</span>
-<span id="L287" class="LineNr">287 </span>
-<span id="L288" class="LineNr">288 </span><span class="Normal">bool</span> <a href='031check_operands.cc.html#L288'>has_operands</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L289" class="LineNr">289 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> &gt; <a href='031check_operands.cc.html#L292'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L290" class="LineNr">290 </span><span class="Delimiter">}</span>
-<span id="L291" class="LineNr">291 </span>
-<span id="L292" class="LineNr">292 </span><span class="Normal">int</span> <a href='031check_operands.cc.html#L292'>first_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L293" class="LineNr">293 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L294" class="LineNr">294 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f2&quot;</span> || inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L295" class="LineNr">295 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
-<span id="L296" class="LineNr">296 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
-<span id="L297" class="LineNr">297 </span>    <span class="Normal">else</span>
-<span id="L298" class="LineNr">298 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Delimiter">}</span>
-<span id="L300" class="LineNr">300 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L301" class="LineNr">301 </span><span class="Delimiter">}</span>
-<span id="L302" class="LineNr">302 </span>
-<span id="L303" class="LineNr">303 </span><span class="Comment">// Scan the metadata of 'w' and return the bit corresponding to any operand type.</span>
-<span id="L304" class="LineNr">304 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
-<span id="L305" class="LineNr">305 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L305'>bitvector_for_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L307" class="LineNr">307 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L309" class="LineNr">309 </span>    <span class="Normal">const</span> string&amp; curr = w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L310" class="LineNr">310 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L70'>Operand_type</a></span><span class="Delimiter">,</span> curr<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
-<span id="L311" class="LineNr">311 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L312" class="LineNr">312 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L313" class="LineNr">313 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L90'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
-<span id="L314" class="LineNr">314 </span>    <span class="Delimiter">}</span>
-<span id="L315" class="LineNr">315 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L70'>Operand_type</a></span><span class="Delimiter">,</span> curr<span class="Delimiter">));</span>
-<span id="L316" class="LineNr">316 </span>    found =<span class="Constant"> true</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> bv<span class="Delimiter">;</span>
-<span id="L319" class="LineNr">319 </span><span class="Delimiter">}</span>
-<span id="L320" class="LineNr">320 </span>
-<span id="L321" class="LineNr">321 </span><span class="Delimiter">:(scenario conflicting_operand_type)</span>
-<span id="L322" class="LineNr">322 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L323" class="LineNr">323 </span>== <span class="Constant">0x1</span>
-<span id="L324" class="LineNr">324 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
-<span id="L325" class="LineNr">325 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
+<span id="L218" class="LineNr">218 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;d3&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// shift</span>
+<span id="L219" class="LineNr">219 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// test/not/mul/div</span>
+<span id="L220" class="LineNr">220 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// jump/push/call</span>
+<span id="L221" class="LineNr">221 </span>
+<span id="L222" class="LineNr">222 </span>  <span class="SalientComment">//// Class O: op, ModR/M, subop (not r32) and imm8</span>
+<span id="L223" class="LineNr">223 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L224" class="LineNr">224 </span>  <span class="Comment">//  0     1     0      |0       0     1     1</span>
+<span id="L225" class="LineNr">225 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c1&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x23</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
+<span id="L226" class="LineNr">226 </span>
+<span id="L227" class="LineNr">227 </span>  <span class="SalientComment">//// Class P: op, ModR/M and imm32</span>
+<span id="L228" class="LineNr">228 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L229" class="LineNr">229 </span>  <span class="Comment">//  1     0     0      |0       0     0     1</span>
+<span id="L230" class="LineNr">230 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x41</span><span class="Delimiter">);</span>  <span class="Comment">// copy</span>
+<span id="L231" class="LineNr">231 </span>
+<span id="L232" class="LineNr">232 </span>  <span class="SalientComment">//// Class Q: op, ModR/M, subop (not r32) and imm32</span>
+<span id="L233" class="LineNr">233 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L234" class="LineNr">234 </span>  <span class="Comment">//  1     0     0      |0       0     1     1</span>
+<span id="L235" class="LineNr">235 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
+<span id="L236" class="LineNr">236 </span>
+<span id="L237" class="LineNr">237 </span>  <span class="Comment">// End Init Permitted Operands</span>
+<span id="L238" class="LineNr">238 </span><span class="Delimiter">}</span>
+<span id="L239" class="LineNr">239 </span>
+<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(code)</span>
+<span id="L241" class="LineNr">241 </span><span class="Comment">#define HAS(bitvector, bit)  ((bitvector) &amp; (1 &lt;&lt; (bit)))</span>
+<span id="L242" class="LineNr">242 </span><span class="Comment">#define SET(bitvector, bit)  ((bitvector) | (1 &lt;&lt; (bit)))</span>
+<span id="L243" class="LineNr">243 </span><span class="Comment">#define CLEAR(bitvector, bit)  ((bitvector) &amp; (~(1 &lt;&lt; (bit))))</span>
+<span id="L244" class="LineNr">244 </span>
+<span id="L245" class="LineNr">245 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L246" class="LineNr">246 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L247" class="LineNr">247 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L248" class="LineNr">248 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L249" class="LineNr">249 </span>    <a href='031check_operands.cc.html#L343'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L250" class="LineNr">250 </span>    <a href='031check_operands.cc.html#L370'>compare_bitvector_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L251" class="LineNr">251 </span>  <span class="Delimiter">}</span>
+<span id="L252" class="LineNr">252 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L253" class="LineNr">253 </span>    <a href='031check_operands.cc.html#L259'>compare_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L254" class="LineNr">254 </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="Comment">//: Many instructions can be checked just by comparing bitvectors.</span>
+<span id="L258" class="LineNr">258 </span>
+<span id="L259" class="LineNr">259 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L259'>compare_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L260" class="LineNr">260 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L294'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
+<span id="L261" class="LineNr">261 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L285'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L262" class="LineNr">262 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L263" class="LineNr">263 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
+<span id="L264" class="LineNr">264 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L265" class="LineNr">265 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
+<span id="L266" class="LineNr">266 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
+<span id="L267" class="LineNr">267 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L69'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L268" class="LineNr">268 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
+<span id="L269" class="LineNr">269 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L270" class="LineNr">270 </span>    <span class="Normal">else</span>
+<span id="L271" class="LineNr">271 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L272" class="LineNr">272 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L273" class="LineNr">273 </span>  <span class="Delimiter">}</span>
+<span id="L274" class="LineNr">274 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L275" class="LineNr">275 </span><span class="Delimiter">}</span>
+<span id="L276" class="LineNr">276 </span>
+<span id="L277" class="LineNr">277 </span>string <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L278" class="LineNr">278 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L280" class="LineNr">280 </span>  <span class="Comment">// strip stuff in parens from the name</span>
+<span id="L281" class="LineNr">281 </span>  <span class="Normal">const</span> string&amp; s = get<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L282" class="LineNr">282 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot; (&quot;</span><span class="Delimiter">))</span>+<span class="Constant">')'</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">uint32_t</span> <a href='031check_operands.cc.html#L285'>compute_operand_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L286" class="LineNr">286 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L287" class="LineNr">287 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L288" class="LineNr">288 </span>    bitvector = bitvector | <a href='031check_operands.cc.html#L311'>bitvector_for_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L289" class="LineNr">289 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L90'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L290" class="LineNr">290 </span>  <span class="Delimiter">}</span>
+<span id="L291" class="LineNr">291 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
+<span id="L292" class="LineNr">292 </span><span class="Delimiter">}</span>
+<span id="L293" class="LineNr">293 </span>
+<span id="L294" class="LineNr">294 </span><span class="Normal">bool</span> <a href='031check_operands.cc.html#L294'>has_operands</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L295" class="LineNr">295 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> &gt; <a href='031check_operands.cc.html#L298'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L296" class="LineNr">296 </span><span class="Delimiter">}</span>
+<span id="L297" class="LineNr">297 </span>
+<span id="L298" class="LineNr">298 </span><span class="Normal">int</span> <a href='031check_operands.cc.html#L298'>first_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f2&quot;</span> || inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L301" class="LineNr">301 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
+<span id="L302" class="LineNr">302 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
+<span id="L303" class="LineNr">303 </span>    <span class="Normal">else</span>
+<span id="L304" class="LineNr">304 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L305" class="LineNr">305 </span>  <span class="Delimiter">}</span>
+<span id="L306" class="LineNr">306 </span>  <span class="Identifier">return</span> <span class="Constant">1</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="Comment">// Scan the metadata of 'w' and return the bit corresponding to any operand type.</span>
+<span id="L310" class="LineNr">310 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
+<span id="L311" class="LineNr">311 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L311'>bitvector_for_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L312" class="LineNr">312 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L313" class="LineNr">313 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L314" class="LineNr">314 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L315" class="LineNr">315 </span>    <span class="Normal">const</span> string&amp; curr = w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L316" class="LineNr">316 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L70'>Operand_type</a></span><span class="Delimiter">,</span> curr<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
+<span id="L317" class="LineNr">317 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L318" class="LineNr">318 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L319" class="LineNr">319 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L90'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
+<span id="L320" class="LineNr">320 </span>    <span class="Delimiter">}</span>
+<span id="L321" class="LineNr">321 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L70'>Operand_type</a></span><span class="Delimiter">,</span> curr<span class="Delimiter">));</span>
+<span id="L322" class="LineNr">322 </span>    found =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L323" class="LineNr">323 </span>  <span class="Delimiter">}</span>
+<span id="L324" class="LineNr">324 </span>  <span class="Identifier">return</span> bv<span class="Delimiter">;</span>
+<span id="L325" class="LineNr">325 </span><span class="Delimiter">}</span>
 <span id="L326" class="LineNr">326 </span>
-<span id="L327" class="LineNr">327 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
-<span id="L328" class="LineNr">328 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
-<span id="L329" class="LineNr">329 </span>
-<span id="L330" class="LineNr">330 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
-<span id="L331" class="LineNr">331 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L332" class="LineNr">332 </span>== <span class="Constant">0x1</span>
-<span id="L333" class="LineNr">333 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop       <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
-<span id="L334" class="LineNr">334 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with imm32 based on subop): missing mod operand</span>
+<span id="L327" class="LineNr">327 </span><span class="Delimiter">:(scenario conflicting_operand_type)</span>
+<span id="L328" class="LineNr">328 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L329" class="LineNr">329 </span>== <span class="Constant">0x1</span>
+<span id="L330" class="LineNr">330 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
+<span id="L331" class="LineNr">331 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
+<span id="L332" class="LineNr">332 </span>
+<span id="L333" class="LineNr">333 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
+<span id="L334" class="LineNr">334 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
 <span id="L335" class="LineNr">335 </span>
-<span id="L336" class="LineNr">336 </span><span class="Delimiter">:(code)</span>
-<span id="L337" class="LineNr">337 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L337'>check_operands_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L338" class="LineNr">338 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L339" class="LineNr">339 </span>  <a href='031check_operands.cc.html#L398'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L340" class="LineNr">340 </span>  <a href='031check_operands.cc.html#L398'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L341" class="LineNr">341 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
-<span id="L342" class="LineNr">342 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;81&quot;</span> || op<span class="Delimiter">.</span>data == <span class="Constant">&quot;8f&quot;</span> || op<span class="Delimiter">.</span>data == <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// keep sync'd with 'help subop'</span>
-<span id="L343" class="LineNr">343 </span>    <a href='031check_operands.cc.html#L398'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L344" class="LineNr">344 </span>    <a href='031check_operands.cc.html#L403'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;should be replaced by subop&quot;</span><span class="Delimiter">);</span>
-<span id="L345" class="LineNr">345 </span>  <span class="Delimiter">}</span>
-<span id="L346" class="LineNr">346 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L347" class="LineNr">347 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span>data != <span class="Constant">&quot;4&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L348" class="LineNr">348 </span>  <span class="Comment">// SIB byte checks</span>
-<span id="L349" class="LineNr">349 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
-<span id="L350" class="LineNr">350 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Comment">/*</span><span class="Comment">direct</span><span class="Comment">*/</span><span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L351" class="LineNr">351 </span>    <a href='031check_operands.cc.html#L398'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L352" class="LineNr">352 </span>    <a href='031check_operands.cc.html#L398'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>  <span class="Comment">// otherwise why go to SIB?</span>
-<span id="L353" class="LineNr">353 </span>  <span class="Delimiter">}</span>
-<span id="L354" class="LineNr">354 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L355" class="LineNr">355 </span>    <a href='031check_operands.cc.html#L403'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
-<span id="L356" class="LineNr">356 </span>    <a href='031check_operands.cc.html#L403'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
-<span id="L357" class="LineNr">357 </span>  <span class="Delimiter">}</span>
-<span id="L358" class="LineNr">358 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span>
-<span id="L359" class="LineNr">359 </span><span class="Delimiter">}</span>
-<span id="L360" class="LineNr">360 </span>
-<span id="L361" class="LineNr">361 </span><span class="Comment">// same as compare_bitvector, with a couple of exceptions for modrm-based instructions</span>
-<span id="L362" class="LineNr">362 </span><span class="Comment">//   exception 1: ignore modrm bit since we already checked it above</span>
-<span id="L363" class="LineNr">363 </span><span class="Comment">//   exception 2: modrm instructions can use a displacement on occasion</span>
-<span id="L364" class="LineNr">364 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L364'>compare_bitvector_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L365" class="LineNr">365 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L288'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L366" class="LineNr">366 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L279'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L367" class="LineNr">367 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L368" class="LineNr">368 </span>  expected = CLEAR<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">);</span>  <span class="Comment">// exception 1</span>
-<span id="L369" class="LineNr">369 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
-<span id="L370" class="LineNr">370 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L371" class="LineNr">371 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing for modrm &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
-<span id="L372" class="LineNr">372 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
-<span id="L373" class="LineNr">373 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L69'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L374" class="LineNr">374 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L61'>DISP8</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L375" class="LineNr">375 </span>      <span class="Normal">int32_t</span> mod = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
-<span id="L376" class="LineNr">376 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Constant">1</span><span class="Delimiter">)</span>
-<span id="L377" class="LineNr">377 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L271'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L378" class="LineNr">378 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
-<span id="L379" class="LineNr">379 </span>    <span class="Delimiter">}</span>
-<span id="L380" class="LineNr">380 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L63'>DISP32</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L336" class="LineNr">336 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
+<span id="L337" class="LineNr">337 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L338" class="LineNr">338 </span>== <span class="Constant">0x1</span>
+<span id="L339" class="LineNr">339 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop       <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
+<span id="L340" class="LineNr">340 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with imm32 based on subop): missing mod operand</span>
+<span id="L341" class="LineNr">341 </span>
+<span id="L342" class="LineNr">342 </span><span class="Delimiter">:(code)</span>
+<span id="L343" class="LineNr">343 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L343'>check_operands_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L344" class="LineNr">344 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
+<span id="L345" class="LineNr">345 </span>  <a href='031check_operands.cc.html#L404'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L346" class="LineNr">346 </span>  <a href='031check_operands.cc.html#L404'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L347" class="LineNr">347 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
+<span id="L348" class="LineNr">348 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;81&quot;</span> || op<span class="Delimiter">.</span>data == <span class="Constant">&quot;8f&quot;</span> || op<span class="Delimiter">.</span>data == <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// keep sync'd with 'help subop'</span>
+<span id="L349" class="LineNr">349 </span>    <a href='031check_operands.cc.html#L404'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L350" class="LineNr">350 </span>    <a href='031check_operands.cc.html#L409'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;should be replaced by subop&quot;</span><span class="Delimiter">);</span>
+<span id="L351" class="LineNr">351 </span>  <span class="Delimiter">}</span>
+<span id="L352" class="LineNr">352 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L353" class="LineNr">353 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span>data != <span class="Constant">&quot;4&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L354" class="LineNr">354 </span>  <span class="Comment">// SIB byte checks</span>
+<span id="L355" class="LineNr">355 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
+<span id="L356" class="LineNr">356 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Comment">/*</span><span class="Comment">direct</span><span class="Comment">*/</span><span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L357" class="LineNr">357 </span>    <a href='031check_operands.cc.html#L404'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L358" class="LineNr">358 </span>    <a href='031check_operands.cc.html#L404'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>  <span class="Comment">// otherwise why go to SIB?</span>
+<span id="L359" class="LineNr">359 </span>  <span class="Delimiter">}</span>
+<span id="L360" class="LineNr">360 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L361" class="LineNr">361 </span>    <a href='031check_operands.cc.html#L409'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
+<span id="L362" class="LineNr">362 </span>    <a href='031check_operands.cc.html#L409'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
+<span id="L363" class="LineNr">363 </span>  <span class="Delimiter">}</span>
+<span id="L364" class="LineNr">364 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span>
+<span id="L365" class="LineNr">365 </span><span class="Delimiter">}</span>
+<span id="L366" class="LineNr">366 </span>
+<span id="L367" class="LineNr">367 </span><span class="Comment">// same as compare_bitvector, with a couple of exceptions for modrm-based instructions</span>
+<span id="L368" class="LineNr">368 </span><span class="Comment">//   exception 1: ignore modrm bit since we already checked it above</span>
+<span id="L369" class="LineNr">369 </span><span class="Comment">//   exception 2: modrm instructions can use a displacement on occasion</span>
+<span id="L370" class="LineNr">370 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L370'>compare_bitvector_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L371" class="LineNr">371 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L294'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
+<span id="L372" class="LineNr">372 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L285'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L373" class="LineNr">373 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L374" class="LineNr">374 </span>  expected = CLEAR<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">);</span>  <span class="Comment">// exception 1</span>
+<span id="L375" class="LineNr">375 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
+<span id="L376" class="LineNr">376 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L377" class="LineNr">377 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing for modrm &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
+<span id="L378" class="LineNr">378 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
+<span id="L379" class="LineNr">379 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L69'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L380" class="LineNr">380 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L61'>DISP8</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L381" class="LineNr">381 </span>      <span class="Normal">int32_t</span> mod = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
-<span id="L382" class="LineNr">382 </span>      <span class="Normal">int32_t</span> rm32 = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
-<span id="L383" class="LineNr">383 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>mod == <span class="Constant">0</span> &amp;&amp; rm32 == <span class="Constant">5</span><span class="Delimiter">)</span>
-<span id="L384" class="LineNr">384 </span>        <span class="Delimiter">;</span>  <span class="Comment">// ok: special-case for loading address from disp32</span>
-<span id="L385" class="LineNr">385 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Constant">2</span><span class="Delimiter">)</span>
-<span id="L386" class="LineNr">386 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L271'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L387" class="LineNr">387 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
-<span id="L388" class="LineNr">388 </span>    <span class="Delimiter">}</span>
-<span id="L389" class="LineNr">389 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
-<span id="L390" class="LineNr">390 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L271'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L391" class="LineNr">391 </span>    <span class="Normal">else</span>
-<span id="L392" class="LineNr">392 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L271'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L393" class="LineNr">393 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L394" class="LineNr">394 </span>  <span class="Delimiter">}</span>
-<span id="L395" class="LineNr">395 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L396" class="LineNr">396 </span><span class="Delimiter">}</span>
-<span id="L397" class="LineNr">397 </span>
-<span id="L398" class="LineNr">398 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L398'>check_operand_metadata_present</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L399" class="LineNr">399 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
-<span id="L400" class="LineNr">400 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L271'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L401" class="LineNr">401 </span><span class="Delimiter">}</span>
-<span id="L402" class="LineNr">402 </span>
-<span id="L403" class="LineNr">403 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L403'>check_operand_metadata_absent</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; msg<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L404" class="LineNr">404 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
-<span id="L405" class="LineNr">405 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L271'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand (&quot;</span> &lt;&lt; msg &lt;&lt; <span class="Constant">&quot;)\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L406" class="LineNr">406 </span><span class="Delimiter">}</span>
-<span id="L407" class="LineNr">407 </span>
-<span id="L408" class="LineNr">408 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L409" class="LineNr">409 </span><span class="Delimiter">:(scenario modrm_with_displacement)</span>
-<span id="L410" class="LineNr">410 </span><span class="Special">% Reg[EAX].u = 0x1;</span>
-<span id="L411" class="LineNr">411 </span>== <span class="Constant">0x1</span>
-<span id="L412" class="LineNr">412 </span><span class="Comment"># just avoid null pointer</span>
-<span id="L413" class="LineNr">413 </span>8b/copy <span class="Constant">1</span>/mod/lookup+disp8 <span class="Constant">0</span>/rm32/EAX <span class="Constant">2</span>/r32/EDX <span class="Constant">4</span>/disp8  <span class="Comment"># copy *(EAX+4) to EDX</span>
-<span id="L414" class="LineNr">414 </span>$error: <span class="Constant">0</span>
-<span id="L415" class="LineNr">415 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L416" class="LineNr">416 </span>
-<span id="L417" class="LineNr">417 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
-<span id="L418" class="LineNr">418 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L419" class="LineNr">419 </span>== <span class="Constant">0x1</span>
-<span id="L420" class="LineNr">420 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/mod
-<span id="L421" class="LineNr">421 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
+<span id="L382" class="LineNr">382 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Constant">1</span><span class="Delimiter">)</span>
+<span id="L383" class="LineNr">383 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L384" class="LineNr">384 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
+<span id="L385" class="LineNr">385 </span>    <span class="Delimiter">}</span>
+<span id="L386" class="LineNr">386 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L63'>DISP32</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L387" class="LineNr">387 </span>      <span class="Normal">int32_t</span> mod = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
+<span id="L388" class="LineNr">388 </span>      <span class="Normal">int32_t</span> rm32 = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
+<span id="L389" class="LineNr">389 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>mod == <span class="Constant">0</span> &amp;&amp; rm32 == <span class="Constant">5</span><span class="Delimiter">)</span>
+<span id="L390" class="LineNr">390 </span>        <span class="Delimiter">;</span>  <span class="Comment">// ok: special-case for loading address from disp32</span>
+<span id="L391" class="LineNr">391 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Constant">2</span><span class="Delimiter">)</span>
+<span id="L392" class="LineNr">392 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L393" class="LineNr">393 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
+<span id="L394" class="LineNr">394 </span>    <span class="Delimiter">}</span>
+<span id="L395" class="LineNr">395 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
+<span id="L396" class="LineNr">396 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L397" class="LineNr">397 </span>    <span class="Normal">else</span>
+<span id="L398" class="LineNr">398 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L399" class="LineNr">399 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L400" class="LineNr">400 </span>  <span class="Delimiter">}</span>
+<span id="L401" class="LineNr">401 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L402" class="LineNr">402 </span><span class="Delimiter">}</span>
+<span id="L403" class="LineNr">403 </span>
+<span id="L404" class="LineNr">404 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L404'>check_operand_metadata_present</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L405" class="LineNr">405 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
+<span id="L406" class="LineNr">406 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L407" class="LineNr">407 </span><span class="Delimiter">}</span>
+<span id="L408" class="LineNr">408 </span>
+<span id="L409" class="LineNr">409 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L409'>check_operand_metadata_absent</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; msg<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L410" class="LineNr">410 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
+<span id="L411" class="LineNr">411 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand (&quot;</span> &lt;&lt; msg &lt;&lt; <span class="Constant">&quot;)\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L412" class="LineNr">412 </span><span class="Delimiter">}</span>
+<span id="L413" class="LineNr">413 </span>
+<span id="L414" class="LineNr">414 </span><span class="Delimiter">:(scenarios transform)</span>
+<span id="L415" class="LineNr">415 </span><span class="Delimiter">:(scenario modrm_with_displacement)</span>
+<span id="L416" class="LineNr">416 </span><span class="Special">% Reg[EAX].u = 0x1;</span>
+<span id="L417" class="LineNr">417 </span>== <span class="Constant">0x1</span>
+<span id="L418" class="LineNr">418 </span><span class="Comment"># just avoid null pointer</span>
+<span id="L419" class="LineNr">419 </span>8b/copy <span class="Constant">1</span>/mod/lookup+disp8 <span class="Constant">0</span>/rm32/EAX <span class="Constant">2</span>/r32/EDX <span class="Constant">4</span>/disp8  <span class="Comment"># copy *(EAX+4) to EDX</span>
+<span id="L420" class="LineNr">420 </span>$error: <span class="Constant">0</span>
+<span id="L421" class="LineNr">421 </span><span class="Delimiter">:(scenarios run)</span>
 <span id="L422" class="LineNr">422 </span>
-<span id="L423" class="LineNr">423 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
+<span id="L423" class="LineNr">423 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
 <span id="L424" class="LineNr">424 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L425" class="LineNr">425 </span>== <span class="Constant">0x1</span>
-<span id="L426" class="LineNr">426 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/r32
-<span id="L427" class="LineNr">427 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
+<span id="L426" class="LineNr">426 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/mod
+<span id="L427" class="LineNr">427 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
 <span id="L428" class="LineNr">428 </span>
-<span id="L429" class="LineNr">429 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
+<span id="L429" class="LineNr">429 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
 <span id="L430" class="LineNr">430 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L431" class="LineNr">431 </span>== <span class="Constant">0x1</span>
-<span id="L432" class="LineNr">432 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod            <span class="Constant">1</span>/imm32
-<span id="L433" class="LineNr">433 </span><span class="traceContains">+error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with imm32 based on subop): missing rm32 operand</span>
+<span id="L432" class="LineNr">432 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/r32
+<span id="L433" class="LineNr">433 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
 <span id="L434" class="LineNr">434 </span>
-<span id="L435" class="LineNr">435 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
+<span id="L435" class="LineNr">435 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
 <span id="L436" class="LineNr">436 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L437" class="LineNr">437 </span>== <span class="Constant">0x1</span>
-<span id="L438" class="LineNr">438 </span><span class="Constant">81</span>             <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
-<span id="L439" class="LineNr">439 </span><span class="traceContains">+error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with imm32 based on subop): missing subop operand</span>
+<span id="L438" class="LineNr">438 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod            <span class="Constant">1</span>/imm32
+<span id="L439" class="LineNr">439 </span><span class="traceContains">+error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with imm32 based on subop): missing rm32 operand</span>
 <span id="L440" class="LineNr">440 </span>
-<span id="L441" class="LineNr">441 </span><span class="Delimiter">:(scenario check_missing_base_operand)</span>
+<span id="L441" class="LineNr">441 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
 <span id="L442" class="LineNr">442 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L443" class="LineNr">443 </span>== <span class="Constant">0x1</span>
-<span id="L444" class="LineNr">444 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
-<span id="L445" class="LineNr">445 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with imm32 based on subop): missing base operand</span>
+<span id="L444" class="LineNr">444 </span><span class="Constant">81</span>             <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
+<span id="L445" class="LineNr">445 </span><span class="traceContains">+error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with imm32 based on subop): missing subop operand</span>
 <span id="L446" class="LineNr">446 </span>
-<span id="L447" class="LineNr">447 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
+<span id="L447" class="LineNr">447 </span><span class="Delimiter">:(scenario check_missing_base_operand)</span>
 <span id="L448" class="LineNr">448 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L449" class="LineNr">449 </span>== <span class="Constant">0x1</span>
-<span id="L450" class="LineNr">450 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">0</span>/base <span class="Constant">1</span>/imm32
-<span id="L451" class="LineNr">451 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32' (combine rm32 with imm32 based on subop): missing index operand</span>
+<span id="L450" class="LineNr">450 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
+<span id="L451" class="LineNr">451 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with imm32 based on subop): missing base operand</span>
 <span id="L452" class="LineNr">452 </span>
-<span id="L453" class="LineNr">453 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</span>
+<span id="L453" class="LineNr">453 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
 <span id="L454" class="LineNr">454 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L455" class="LineNr">455 </span>== <span class="Constant">0x1</span>
-<span id="L456" class="LineNr">456 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">2</span>/index <span class="Constant">3</span>/scale <span class="Constant">1</span>/imm32
-<span id="L457" class="LineNr">457 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32' (combine rm32 with imm32 based on subop): missing base operand</span>
+<span id="L456" class="LineNr">456 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">0</span>/base <span class="Constant">1</span>/imm32
+<span id="L457" class="LineNr">457 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32' (combine rm32 with imm32 based on subop): missing index operand</span>
 <span id="L458" class="LineNr">458 </span>
-<span id="L459" class="LineNr">459 </span><span class="Delimiter">:(scenario check_extra_displacement)</span>
+<span id="L459" class="LineNr">459 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</span>
 <span id="L460" class="LineNr">460 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L461" class="LineNr">461 </span>== <span class="Constant">0x1</span>
-<span id="L462" class="LineNr">462 </span><span class="Constant">89</span>/copy <span class="Constant">0</span>/mod/indirect <span class="Constant">0</span>/rm32/EAX <span class="Constant">1</span>/r32/ECX <span class="Constant">4</span>/disp8
-<span id="L463" class="LineNr">463 </span><span class="traceContains">+error: '89/copy 0/mod/indirect 0/rm32/EAX 1/r32/ECX 4/disp8' (copy r32 to rm32): unexpected disp8 operand</span>
+<span id="L462" class="LineNr">462 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">2</span>/index <span class="Constant">3</span>/scale <span class="Constant">1</span>/imm32
+<span id="L463" class="LineNr">463 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32' (combine rm32 with imm32 based on subop): missing base operand</span>
 <span id="L464" class="LineNr">464 </span>
-<span id="L465" class="LineNr">465 </span><span class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
-<span id="L466" class="LineNr">466 </span>== <span class="Constant">0x1</span>
-<span id="L467" class="LineNr">467 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">3</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
-<span id="L468" class="LineNr">468 </span>$error: <span class="Constant">0</span>
-<span id="L469" class="LineNr">469 </span>
-<span id="L470" class="LineNr">470 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
-<span id="L471" class="LineNr">471 </span>
-<span id="L472" class="LineNr">472 </span><span class="Delimiter">:(code)</span>
-<span id="L473" class="LineNr">473 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L519'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L474" class="LineNr">474 </span>  assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
-<span id="L475" class="LineNr">475 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L476" class="LineNr">476 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L477" class="LineNr">477 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L478" class="LineNr">478 </span>  <span class="Delimiter">}</span>
-<span id="L479" class="LineNr">479 </span>  <a href='011run.cc.html#L123'>word</a> op = <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
-<span id="L480" class="LineNr">480 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L481" class="LineNr">481 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown 2-byte opcode '0f &quot;</span> &lt;&lt; op<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L482" class="LineNr">482 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L483" class="LineNr">483 </span>  <span class="Delimiter">}</span>
-<span id="L484" class="LineNr">484 </span>  <a href='031check_operands.cc.html#L519'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L485" class="LineNr">485 </span><span class="Delimiter">}</span>
-<span id="L486" class="LineNr">486 </span>
-<span id="L487" class="LineNr">487 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L487'>check_operands_f3</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L488" class="LineNr">488 </span>  <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L489" class="LineNr">489 </span><span class="Delimiter">}</span>
-<span id="L490" class="LineNr">490 </span>
-<span id="L491" class="LineNr">491 </span><span class="Delimiter">:(scenario check_missing_disp32_operand)</span>
-<span id="L492" class="LineNr">492 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L493" class="LineNr">493 </span>== <span class="Constant">0x1</span>
-<span id="L494" class="LineNr">494 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L495" class="LineNr">495 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L496" class="LineNr">496 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L497" class="LineNr">497 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                             <span class="Comment"># jmp if ZF to ??</span>
-<span id="L498" class="LineNr">498 </span><span class="traceContains">+error: '0f 84' (jump disp32 bytes away if equal, if ZF is set): missing disp32 operand</span>
-<span id="L499" class="LineNr">499 </span>
-<span id="L500" class="LineNr">500 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L501" class="LineNr">501 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <span class="Special"><a href='031check_operands.cc.html#L501'>Permitted_operands_0f</a></span><span class="Delimiter">;</span>
-<span id="L502" class="LineNr">502 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
-<span id="L503" class="LineNr">503 </span><span class="SalientComment">//// Class D: just op and disp32</span>
-<span id="L504" class="LineNr">504 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L505" class="LineNr">505 </span><span class="Comment">//  0     0     1      |0       0     0     0</span>
-<span id="L506" class="LineNr">506 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L501'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L507" class="LineNr">507 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L501'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L508" class="LineNr">508 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L501'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L509" class="LineNr">509 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L501'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L510" class="LineNr">510 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L501'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L511" class="LineNr">511 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L501'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L512" class="LineNr">512 </span>
-<span id="L513" class="LineNr">513 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
-<span id="L514" class="LineNr">514 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L515" class="LineNr">515 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
-<span id="L516" class="LineNr">516 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L501'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L517" class="LineNr">517 </span>
-<span id="L518" class="LineNr">518 </span><span class="Delimiter">:(code)</span>
-<span id="L519" class="LineNr">519 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L519'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L520" class="LineNr">520 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L501'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L521" class="LineNr">521 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">))</span>
-<span id="L522" class="LineNr">522 </span>    <a href='031check_operands.cc.html#L337'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L523" class="LineNr">523 </span>  <a href='031check_operands.cc.html#L526'>compare_bitvector_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> CLEAR<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
-<span id="L524" class="LineNr">524 </span><span class="Delimiter">}</span>
-<span id="L525" class="LineNr">525 </span>
-<span id="L526" class="LineNr">526 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L526'>compare_bitvector_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L527" class="LineNr">527 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L288'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L528" class="LineNr">528 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L279'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L529" class="LineNr">529 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L530" class="LineNr">530 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
-<span id="L531" class="LineNr">531 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L532" class="LineNr">532 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
-<span id="L533" class="LineNr">533 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
-<span id="L534" class="LineNr">534 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L69'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L535" class="LineNr">535 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
-<span id="L536" class="LineNr">536 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L544'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L537" class="LineNr">537 </span>    <span class="Normal">else</span>
-<span id="L538" class="LineNr">538 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L544'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L539" class="LineNr">539 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L540" class="LineNr">540 </span>  <span class="Delimiter">}</span>
-<span id="L541" class="LineNr">541 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L542" class="LineNr">542 </span><span class="Delimiter">}</span>
-<span id="L543" class="LineNr">543 </span>
-<span id="L544" class="LineNr">544 </span>string <a href='031check_operands.cc.html#L544'>maybe_name_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L545" class="LineNr">545 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L546" class="LineNr">546 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L547" class="LineNr">547 </span>  <span class="Comment">// strip stuff in parens from the name</span>
-<span id="L548" class="LineNr">548 </span>  <span class="Normal">const</span> string&amp; s = get<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L549" class="LineNr">549 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot; (&quot;</span><span class="Delimiter">))</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
-<span id="L550" class="LineNr">550 </span><span class="Delimiter">}</span>
-<span id="L551" class="LineNr">551 </span>
-<span id="L552" class="LineNr">552 </span>string <a href='031check_operands.cc.html#L552'>tolower</a><span class="Delimiter">(</span><span class="Normal">const</span> <span class="Normal">char</span>* s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L553" class="LineNr">553 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L554" class="LineNr">554 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  *s<span class="Delimiter">;</span>  ++s<span class="Delimiter">)</span>
-<span id="L555" class="LineNr">555 </span>    out &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">char</span>&gt;<span class="Delimiter">(</span><a href='031check_operands.cc.html#L552'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
-<span id="L556" class="LineNr">556 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L557" class="LineNr">557 </span><span class="Delimiter">}</span>
-<span id="L558" class="LineNr">558 </span>
-<span id="L559" class="LineNr">559 </span><span class="Comment">#undef HAS</span>
-<span id="L560" class="LineNr">560 </span><span class="Comment">#undef SET</span>
-<span id="L561" class="LineNr">561 </span><span class="Comment">#undef CLEAR</span>
-<span id="L562" class="LineNr">562 </span>
-<span id="L563" class="LineNr">563 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L564" class="LineNr">564 </span><span class="Comment">#include&lt;cctype&gt;</span>
+<span id="L465" class="LineNr">465 </span><span class="Delimiter">:(scenario check_extra_displacement)</span>
+<span id="L466" class="LineNr">466 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L467" class="LineNr">467 </span>== <span class="Constant">0x1</span>
+<span id="L468" class="LineNr">468 </span><span class="Constant">89</span>/copy <span class="Constant">0</span>/mod/indirect <span class="Constant">0</span>/rm32/EAX <span class="Constant">1</span>/r32/ECX <span class="Constant">4</span>/disp8
+<span id="L469" class="LineNr">469 </span><span class="traceContains">+error: '89/copy 0/mod/indirect 0/rm32/EAX 1/r32/ECX 4/disp8' (copy r32 to rm32): unexpected disp8 operand</span>
+<span id="L470" class="LineNr">470 </span>
+<span id="L471" class="LineNr">471 </span><span class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
+<span id="L472" class="LineNr">472 </span>== <span class="Constant">0x1</span>
+<span id="L473" class="LineNr">473 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">3</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
+<span id="L474" class="LineNr">474 </span>$error: <span class="Constant">0</span>
+<span id="L475" class="LineNr">475 </span>
+<span id="L476" class="LineNr">476 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
+<span id="L477" class="LineNr">477 </span>
+<span id="L478" class="LineNr">478 </span><span class="Delimiter">:(code)</span>
+<span id="L479" class="LineNr">479 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L525'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L480" class="LineNr">480 </span>  assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
+<span id="L481" class="LineNr">481 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L482" class="LineNr">482 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L483" class="LineNr">483 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L484" class="LineNr">484 </span>  <span class="Delimiter">}</span>
+<span id="L485" class="LineNr">485 </span>  <a href='011run.cc.html#L123'>word</a> op = <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
+<span id="L486" class="LineNr">486 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L487" class="LineNr">487 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown 2-byte opcode '0f &quot;</span> &lt;&lt; op<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L488" class="LineNr">488 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L489" class="LineNr">489 </span>  <span class="Delimiter">}</span>
+<span id="L490" class="LineNr">490 </span>  <a href='031check_operands.cc.html#L525'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L491" class="LineNr">491 </span><span class="Delimiter">}</span>
+<span id="L492" class="LineNr">492 </span>
+<span id="L493" class="LineNr">493 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L493'>check_operands_f3</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L494" class="LineNr">494 </span>  <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L495" class="LineNr">495 </span><span class="Delimiter">}</span>
+<span id="L496" class="LineNr">496 </span>
+<span id="L497" class="LineNr">497 </span><span class="Delimiter">:(scenario check_missing_disp32_operand)</span>
+<span id="L498" class="LineNr">498 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L499" class="LineNr">499 </span>== <span class="Constant">0x1</span>
+<span id="L500" class="LineNr">500 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L501" class="LineNr">501 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L502" class="LineNr">502 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L503" class="LineNr">503 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                             <span class="Comment"># jmp if ZF to ??</span>
+<span id="L504" class="LineNr">504 </span><span class="traceContains">+error: '0f 84' (jump disp32 bytes away if equal, if ZF is set): missing disp32 operand</span>
+<span id="L505" class="LineNr">505 </span>
+<span id="L506" class="LineNr">506 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L507" class="LineNr">507 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">;</span>
+<span id="L508" class="LineNr">508 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
+<span id="L509" class="LineNr">509 </span><span class="SalientComment">//// Class D: just op and disp32</span>
+<span id="L510" class="LineNr">510 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L511" class="LineNr">511 </span><span class="Comment">//  0     0     1      |0       0     0     0</span>
+<span id="L512" class="LineNr">512 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L513" class="LineNr">513 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L514" class="LineNr">514 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L515" class="LineNr">515 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L516" class="LineNr">516 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L517" class="LineNr">517 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L518" class="LineNr">518 </span>
+<span id="L519" class="LineNr">519 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
+<span id="L520" class="LineNr">520 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L521" class="LineNr">521 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
+<span id="L522" class="LineNr">522 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L523" class="LineNr">523 </span>
+<span id="L524" class="LineNr">524 </span><span class="Delimiter">:(code)</span>
+<span id="L525" class="LineNr">525 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L525'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L526" class="LineNr">526 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L527" class="LineNr">527 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">))</span>
+<span id="L528" class="LineNr">528 </span>    <a href='031check_operands.cc.html#L343'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L529" class="LineNr">529 </span>  <a href='031check_operands.cc.html#L532'>compare_bitvector_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> CLEAR<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
+<span id="L530" class="LineNr">530 </span><span class="Delimiter">}</span>
+<span id="L531" class="LineNr">531 </span>
+<span id="L532" class="LineNr">532 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L532'>compare_bitvector_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L533" class="LineNr">533 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L294'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
+<span id="L534" class="LineNr">534 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L285'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L535" class="LineNr">535 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L536" class="LineNr">536 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
+<span id="L537" class="LineNr">537 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L538" class="LineNr">538 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
+<span id="L539" class="LineNr">539 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
+<span id="L540" class="LineNr">540 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L69'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L541" class="LineNr">541 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
+<span id="L542" class="LineNr">542 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L550'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L543" class="LineNr">543 </span>    <span class="Normal">else</span>
+<span id="L544" class="LineNr">544 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L550'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L545" class="LineNr">545 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L546" class="LineNr">546 </span>  <span class="Delimiter">}</span>
+<span id="L547" class="LineNr">547 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L548" class="LineNr">548 </span><span class="Delimiter">}</span>
+<span id="L549" class="LineNr">549 </span>
+<span id="L550" class="LineNr">550 </span>string <a href='031check_operands.cc.html#L550'>maybe_name_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L551" class="LineNr">551 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L552" class="LineNr">552 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L553" class="LineNr">553 </span>  <span class="Comment">// strip stuff in parens from the name</span>
+<span id="L554" class="LineNr">554 </span>  <span class="Normal">const</span> string&amp; s = get<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L555" class="LineNr">555 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot; (&quot;</span><span class="Delimiter">))</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
+<span id="L556" class="LineNr">556 </span><span class="Delimiter">}</span>
+<span id="L557" class="LineNr">557 </span>
+<span id="L558" class="LineNr">558 </span>string <a href='031check_operands.cc.html#L558'>tolower</a><span class="Delimiter">(</span><span class="Normal">const</span> <span class="Normal">char</span>* s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L559" class="LineNr">559 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L560" class="LineNr">560 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  *s<span class="Delimiter">;</span>  ++s<span class="Delimiter">)</span>
+<span id="L561" class="LineNr">561 </span>    out &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">char</span>&gt;<span class="Delimiter">(</span><a href='031check_operands.cc.html#L558'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
+<span id="L562" class="LineNr">562 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L563" class="LineNr">563 </span><span class="Delimiter">}</span>
+<span id="L564" class="LineNr">564 </span>
+<span id="L565" class="LineNr">565 </span><span class="Comment">#undef HAS</span>
+<span id="L566" class="LineNr">566 </span><span class="Comment">#undef SET</span>
+<span id="L567" class="LineNr">567 </span><span class="Comment">#undef CLEAR</span>
+<span id="L568" class="LineNr">568 </span>
+<span id="L569" class="LineNr">569 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L570" class="LineNr">570 </span><span class="Comment">#include&lt;cctype&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/032check_operand_bounds.cc.html b/html/subx/032check_operand_bounds.cc.html
index ca3d7ed9..c5d90760 100644
--- a/html/subx/032check_operand_bounds.cc.html
+++ b/html/subx/032check_operand_bounds.cc.html
@@ -96,7 +96,7 @@ if ('onhashchange' in window) {
 <span id="L30" class="LineNr">30 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check operand bounds&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L31" class="LineNr">31 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L32" class="LineNr">32 </span>    <span class="Normal">const</span> line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L33" class="LineNr">33 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <a href='031check_operands.cc.html#L292'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
+<span id="L33" class="LineNr">33 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <a href='031check_operands.cc.html#L298'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
 <span id="L34" class="LineNr">34 </span>      check_operand_bounds<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span>
 <span id="L35" class="LineNr">35 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// stop at the first mal-formed instruction</span>
 <span id="L36" class="LineNr">36 </span>  <span class="Delimiter">}</span>
diff --git a/html/subx/063print-byte.subx.html b/html/subx/063print-byte.subx.html
new file mode 100644
index 00000000..013ea642
--- /dev/null
+++ b/html/subx/063print-byte.subx.html
@@ -0,0 +1,208 @@
+<!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/063print-byte.subx</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,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; }
+.subxS2Comment a { color:inherit; }
+.subxS1Comment a { color:inherit; }
+.subxComment a { color:inherit; }
+.subxH2Comment a { color:inherit; }
+.subxH1Comment a { color:inherit; }
+* { font-size:12pt; font-size: 1em; }
+.subxComment { color:#16bfff; }
+.subxS2Comment { color:#4466ff; }
+.LineNr { color:#444444; }
+.subxS1Comment { color:#2d8cff; }
+.CommentedCode { color: #6c6c6c; }
+.subxFunction { color: #ff8700; }
+.subxTest { color: #00af00; }
+.Constant { color:#00a0a0; }
+.SpecialChar { color: #ff0000; }
+.subxH1Comment { 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();'>
+<a href='https://github.com/akkartik/mu/blob/master/subx/063print-byte.subx'>https://github.com/akkartik/mu/blob/master/subx/063print-byte.subx</a>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment"># Print the (hex) textual representation of the lowest byte of a number.</span>
+<span id="L2" class="LineNr">  2 </span>
+<span id="L3" class="LineNr">  3 </span>== code
+<span id="L4" class="LineNr">  4 </span><span class="subxComment">#   instruction                     effective address                                                   register    displacement    immediate</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxS1Comment"># . op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxS1Comment"># . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L7" class="LineNr">  7 </span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment"># main:</span>
+<span id="L9" class="LineNr">  9 </span>    e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L10" class="LineNr"> 10 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
+<span id="L11" class="LineNr"> 11 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L12" class="LineNr"> 12 </span>    b8/copy-to-EAX  1/imm32
+<span id="L13" class="LineNr"> 13 </span>    cd/syscall  0x80/imm8
+<span id="L14" class="LineNr"> 14 </span>
+<span id="L15" class="LineNr"> 15 </span><span class="subxFunction">print-byte</span>:  <span class="subxComment"># f : (address buffered-file), n : num -&gt; &lt;void&gt;</span>
+<span id="L16" class="LineNr"> 16 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L17" class="LineNr"> 17 </span>    55/push-EBP
+<span id="L18" class="LineNr"> 18 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L19" class="LineNr"> 19 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L20" class="LineNr"> 20 </span>    50/push-EAX
+<span id="L21" class="LineNr"> 21 </span>    <span class="subxComment"># AL = convert upper nibble to hex</span>
+<span id="L22" class="LineNr"> 22 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EAX</span>
+<span id="L23" class="LineNr"> 23 </span>    c1/shift    5/subop/logic-right 3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm8            <span class="subxComment"># shift EAX right by 4 bits, while padding zeroes</span>
+<span id="L24" class="LineNr"> 24 </span>    <span class="subxS1Comment"># . hex-char(AL)</span>
+<span id="L25" class="LineNr"> 25 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L26" class="LineNr"> 26 </span>    50/push-EAX
+<span id="L27" class="LineNr"> 27 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L28" class="LineNr"> 28 </span>    e8/call  hex-char/disp32
+<span id="L29" class="LineNr"> 29 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L30" class="LineNr"> 30 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L31" class="LineNr"> 31 </span>    <span class="subxComment"># write-byte(f, AL)</span>
+<span id="L32" class="LineNr"> 32 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L33" class="LineNr"> 33 </span>    50/push-EAX
+<span id="L34" class="LineNr"> 34 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x8/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L35" class="LineNr"> 35 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L36" class="LineNr"> 36 </span>    e8/call  write-byte/disp32
+<span id="L37" class="LineNr"> 37 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L38" class="LineNr"> 38 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L39" class="LineNr"> 39 </span>    <span class="subxComment"># AL = convert lower nibble to hex</span>
+<span id="L40" class="LineNr"> 40 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EAX</span>
+<span id="L41" class="LineNr"> 41 </span>    25/and-EAX  0xf/imm32
+<span id="L42" class="LineNr"> 42 </span>    <span class="subxS1Comment"># . hex-char(AL)</span>
+<span id="L43" class="LineNr"> 43 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L44" class="LineNr"> 44 </span>    50/push-EAX
+<span id="L45" class="LineNr"> 45 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L46" class="LineNr"> 46 </span>    e8/call  hex-char/disp32
+<span id="L47" class="LineNr"> 47 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L48" class="LineNr"> 48 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L49" class="LineNr"> 49 </span>    <span class="subxComment"># write-byte(f, AL)</span>
+<span id="L50" class="LineNr"> 50 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L51" class="LineNr"> 51 </span>    50/push-EAX
+<span id="L52" class="LineNr"> 52 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x8/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L53" class="LineNr"> 53 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L54" class="LineNr"> 54 </span>    e8/call  write-byte/disp32
+<span id="L55" class="LineNr"> 55 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L56" class="LineNr"> 56 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L57" class="LineNr"> 57 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L58" class="LineNr"> 58 </span>    59/pop-to-ECX
+<span id="L59" class="LineNr"> 59 </span>    58/pop-to-EAX
+<span id="L60" class="LineNr"> 60 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L61" class="LineNr"> 61 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L62" class="LineNr"> 62 </span>    5d/pop-to-EBP
+<span id="L63" class="LineNr"> 63 </span>    c3/return
+<span id="L64" class="LineNr"> 64 </span>
+<span id="L65" class="LineNr"> 65 </span><span class="subxComment"># extract lowest 4 bits and convert to 8-byte ascii</span>
+<span id="L66" class="LineNr"> 66 </span><span class="subxComment"># return 0xffffffff if more than 4 bits are set</span>
+<span id="L67" class="LineNr"> 67 </span><span class="subxFunction">hex-char</span>:  <span class="subxComment"># n : num -&gt; char_or_error/EAX</span>
+<span id="L68" class="LineNr"> 68 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L69" class="LineNr"> 69 </span>    55/push-EBP
+<span id="L70" class="LineNr"> 70 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L71" class="LineNr"> 71 </span>    <span class="subxComment"># EAX = n</span>
+<span id="L72" class="LineNr"> 72 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L73" class="LineNr"> 73 </span>    <span class="subxComment"># if it's &lt;= 9 add '0' to it</span>
+<span id="L74" class="LineNr"> 74 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x9/imm32         <span class="subxComment"># compare EAX</span>
+<span id="L75" class="LineNr"> 75 </span>    7f/jump-if-greater  $hex-char:check2/disp8
+<span id="L76" class="LineNr"> 76 </span>    05/add-to-EAX  0x30/imm32/'0'
+<span id="L77" class="LineNr"> 77 </span>    eb/jump  $hex-char:end/disp8
+<span id="L78" class="LineNr"> 78 </span><span class="Constant">$hex-char:check2</span>:
+<span id="L79" class="LineNr"> 79 </span>    <span class="subxComment"># else if it's &lt;= 15 add ('a' - 10) to it</span>
+<span id="L80" class="LineNr"> 80 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xf/imm32         <span class="subxComment"># compare EAX</span>
+<span id="L81" class="LineNr"> 81 </span>    7f/jump-if-greater  $hex-char:error/disp8
+<span id="L82" class="LineNr"> 82 </span>    05/add-to-EAX  0x57/imm32  <span class="subxComment"># 'a' - 10</span>
+<span id="L83" class="LineNr"> 83 </span>    eb/jump  $hex-char:end/disp8
+<span id="L84" class="LineNr"> 84 </span><span class="Constant">$hex-char:error</span>:
+<span id="L85" class="LineNr"> 85 </span>    <span class="subxComment"># otherwise return 0xffffffff</span>
+<span id="L86" class="LineNr"> 86 </span>    b8/copy-to-EAX  0xffffffff/imm32
+<span id="L87" class="LineNr"> 87 </span><span class="Constant">$hex-char:end</span>:
+<span id="L88" class="LineNr"> 88 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L89" class="LineNr"> 89 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L90" class="LineNr"> 90 </span>    5d/pop-to-EBP
+<span id="L91" class="LineNr"> 91 </span>    c3/return
+<span id="L92" class="LineNr"> 92 </span>
+<span id="L93" class="LineNr"> 93 </span><span class="subxTest">test-print-byte</span>:
+<span id="L94" class="LineNr"> 94 </span>    <span class="subxH1Comment"># - check that print-byte prints the hex textual representation</span>
+<span id="L95" class="LineNr"> 95 </span>    <span class="subxComment"># setup</span>
+<span id="L96" class="LineNr"> 96 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L97" class="LineNr"> 97 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L98" class="LineNr"> 98 </span>    68/push  _test-stream/imm32
+<span id="L99" class="LineNr"> 99 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L100" class="LineNr">100 </span>    e8/call  clear-stream/disp32
+<span id="L101" class="LineNr">101 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L102" class="LineNr">102 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L103" class="LineNr">103 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L104" class="LineNr">104 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L105" class="LineNr">105 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L106" class="LineNr">106 </span>    05/add-to-EAX  4/imm32
+<span id="L107" class="LineNr">107 </span>    50/push-EAX
+<span id="L108" class="LineNr">108 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L109" class="LineNr">109 </span>    e8/call  clear-stream/disp32
+<span id="L110" class="LineNr">110 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L111" class="LineNr">111 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L112" class="LineNr">112 </span>    <span class="subxComment"># print-byte(_test-buffered-file, 0xa)  # exercises digit, non-digit as well as leading zero</span>
+<span id="L113" class="LineNr">113 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L114" class="LineNr">114 </span>    68/push  0xa/imm32
+<span id="L115" class="LineNr">115 </span>    68/push  _test-buffered-file/imm32
+<span id="L116" class="LineNr">116 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L117" class="LineNr">117 </span>    e8/call  print-byte/disp32
+<span id="L118" class="LineNr">118 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L119" class="LineNr">119 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L120" class="LineNr">120 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
+<span id="L121" class="LineNr">121 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L122" class="LineNr">122 </span>    68/push  _test-buffered-file/imm32
+<span id="L123" class="LineNr">123 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L124" class="LineNr">124 </span>    e8/call  flush/disp32
+<span id="L125" class="LineNr">125 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L126" class="LineNr">126 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L127" class="LineNr">127 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-&gt;data, '0a', msg)</span>
+<span id="L128" class="LineNr">128 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L129" class="LineNr">129 </span>    68/push  <span class="Constant">&quot;F - test-print-byte&quot;</span>/imm32
+<span id="L130" class="LineNr">130 </span>    68/push  0x6130/imm32/0a
+<span id="L131" class="LineNr">131 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
+<span id="L132" class="LineNr">132 </span>    b8/copy-to-EAX  _test-stream/imm32
+<span id="L133" class="LineNr">133 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L134" class="LineNr">134 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L135" class="LineNr">135 </span>    e8/call  check-ints-equal/disp32
+<span id="L136" class="LineNr">136 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L137" class="LineNr">137 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L138" class="LineNr">138 </span>    <span class="subxS1Comment"># . end</span>
+<span id="L139" class="LineNr">139 </span>    c3/return
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/subx/013direct_addressing.cc b/subx/013direct_addressing.cc
index 8d9f0555..c18b5f5c 100644
--- a/subx/013direct_addressing.cc
+++ b/subx/013direct_addressing.cc
@@ -117,7 +117,7 @@ put_new(Name, "f7", "negate/multiply rm32 (with EAX if necessary) depending on s
 +run: storing 0x0000000c
 
 :(before "End Single-Byte Opcodes")
-case 0xf7: {  // xor r32 with r/m32
+case 0xf7: {
   const uint8_t modrm = next();
   trace(90, "run") << "operate on r/m32" << end();
   int32_t* arg1 = effective_address(modrm);
@@ -209,6 +209,164 @@ case 3: {  // negate r/m32
 +run: subop: negate
 +run: overflow
 
+//:: shift left
+
+:(before "End Initialize Op Names")
+put_new(Name, "d3", "shift rm32 by CL bits depending on subop (sal/sar/shl/shr)");
+
+:(scenario shift_left_r32_with_cl)
+% Reg[EBX].i = 13;
+% Reg[ECX].i = 1;
+== 0x1
+# op  ModR/M  SIB   displacement  immediate
+  d3  e3                                      # negate EBX
+# ModR/M in binary: 11 (direct mode) 100 (subop shift left) 011 (dest EBX)
++run: operate on r/m32
++run: r/m32 is EBX
++run: subop: shift left by CL bits
++run: storing 0x0000001a
+
+:(before "End Single-Byte Opcodes")
+case 0xd3: {
+  const uint8_t modrm = next();
+  trace(90, "run") << "operate on r/m32" << end();
+  int32_t* arg1 = effective_address(modrm);
+  const uint8_t subop = (modrm>>3)&0x7;  // middle 3 'reg opcode' bits
+  switch (subop) {
+  case 4: {  // shift left r/m32 by CL
+    trace(90, "run") << "subop: shift left by CL bits" << end();
+    uint8_t count = Reg[ECX].u & 0x1f;
+    // OF is only defined if count is 1
+    if (count == 1) {
+      bool msb = (*arg1 & 0x80000000) >> 1;
+      bool pnsb = (*arg1 & 0x40000000);
+      OF = (msb != pnsb);
+    }
+    *arg1 = (*arg1 << count);
+    ZF = (*arg1 == 0);
+    SF = (*arg1 < 0);
+    trace(90, "run") << "storing 0x" << HEXWORD << *arg1 << end();
+    break;
+  }
+  // End Op d3 Subops
+  default:
+    cerr << "unrecognized sub-opcode after d3: " << NUM(subop) << '\n';
+    exit(1);
+  }
+  break;
+}
+
+//:: shift right arithmetic
+
+:(scenario shift_right_arithmetic_r32_with_cl)
+% Reg[EBX].i = 26;
+% Reg[ECX].i = 1;
+== 0x1
+# op  ModR/M  SIB   displacement  immediate
+  d3  fb                                      # negate EBX
+# ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)
++run: operate on r/m32
++run: r/m32 is EBX
++run: subop: shift right by CL bits, while preserving sign
++run: storing 0x0000000d
+
+:(before "End Op d3 Subops")
+case 7: {  // shift right r/m32 by CL, preserving sign
+  trace(90, "run") << "subop: shift right by CL bits, while preserving sign" << end();
+  uint8_t count = Reg[ECX].u & 0x1f;
+  *arg1 = (*arg1 >> count);
+  ZF = (*arg1 == 0);
+  SF = (*arg1 < 0);
+  // OF is only defined if count is 1
+  if (count == 1) OF = false;
+  trace(90, "run") << "storing 0x" << HEXWORD << *arg1 << end();
+  break;
+}
+
+:(scenario shift_right_arithmetic_odd_r32_with_cl)
+% Reg[EBX].i = 27;
+% Reg[ECX].i = 1;
+== 0x1
+# op  ModR/M  SIB   displacement  immediate
+  d3  fb                                      # negate EBX
+# ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)
++run: operate on r/m32
++run: r/m32 is EBX
++run: subop: shift right by CL bits, while preserving sign
+# result: 13
++run: storing 0x0000000d
+
+:(scenario shift_right_arithmetic_negative_r32_with_cl)
+% Reg[EBX].i = 0xfffffffd;  // -3
+% Reg[ECX].i = 1;
+== 0x1
+# op  ModR/M  SIB   displacement  immediate
+  d3  fb                                      # negate EBX
+# ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)
++run: operate on r/m32
++run: r/m32 is EBX
++run: subop: shift right by CL bits, while preserving sign
+# result: -2
++run: storing 0xfffffffe
+
+//:: shift right logical
+
+:(scenario shift_right_logical_r32_with_cl)
+% Reg[EBX].i = 26;
+% Reg[ECX].i = 1;
+== 0x1
+# op  ModR/M  SIB   displacement  immediate
+  d3  eb                                      # negate EBX
+# ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)
++run: operate on r/m32
++run: r/m32 is EBX
++run: subop: shift right by CL bits, while padding zeroes
++run: storing 0x0000000d
+
+:(before "End Op d3 Subops")
+case 5: {  // shift right r/m32 by CL, preserving sign
+  trace(90, "run") << "subop: shift right by CL bits, while padding zeroes" << end();
+  uint8_t count = Reg[ECX].u & 0x1f;
+  // OF is only defined if count is 1
+  if (count == 1) {
+    bool msb = (*arg1 & 0x80000000) >> 1;
+    bool pnsb = (*arg1 & 0x40000000);
+    OF = (msb != pnsb);
+  }
+  uint32_t* uarg1 = reinterpret_cast<uint32_t*>(arg1);
+  *uarg1 = (*uarg1 >> count);
+  ZF = (*uarg1 == 0);
+  // result is always positive by definition
+  SF = false;
+  trace(90, "run") << "storing 0x" << HEXWORD << *arg1 << end();
+  break;
+}
+
+:(scenario shift_right_logical_odd_r32_with_cl)
+% Reg[EBX].i = 27;
+% Reg[ECX].i = 1;
+== 0x1
+# op  ModR/M  SIB   displacement  immediate
+  d3  eb                                      # negate EBX
+# ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)
++run: operate on r/m32
++run: r/m32 is EBX
++run: subop: shift right by CL bits, while padding zeroes
+# result: 13
++run: storing 0x0000000d
+
+:(scenario shift_right_logical_negative_r32_with_cl)
+% Reg[EBX].i = 0xfffffffd;
+% Reg[ECX].i = 1;
+== 0x1
+# op  ModR/M  SIB   displacement  immediate
+  d3  eb                                      # negate EBX
+# ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)
++run: operate on r/m32
++run: r/m32 is EBX
++run: subop: shift right by CL bits, while padding zeroes
++run: storing 0x7ffffffe
+
 //:: and
 
 :(before "End Initialize Op Names")
diff --git a/subx/015immediate_addressing.cc b/subx/015immediate_addressing.cc
index a5d385b7..ce4bc4db 100644
--- a/subx/015immediate_addressing.cc
+++ b/subx/015immediate_addressing.cc
@@ -110,6 +110,157 @@ case 5: {
 +run: subop subtract
 +run: storing 0x00000009
 
+//:: shift left
+
+:(before "End Initialize Op Names")
+put_new(Name, "c1", "shift rm32 by imm8 bits depending on subop (sal/sar/shl/shr)");
+
+:(scenario shift_left_r32_with_imm8)
+% Reg[EBX].i = 13;
+== 0x1
+# op  ModR/M  SIB   displacement  immediate
+  c1  e3                          01          # negate EBX
+# ModR/M in binary: 11 (direct mode) 100 (subop shift left) 011 (dest EBX)
++run: operate on r/m32
++run: r/m32 is EBX
++run: subop: shift left by CL bits
++run: storing 0x0000001a
+
+:(before "End Single-Byte Opcodes")
+case 0xc1: {
+  const uint8_t modrm = next();
+  trace(90, "run") << "operate on r/m32" << end();
+  int32_t* arg1 = effective_address(modrm);
+  const uint8_t subop = (modrm>>3)&0x7;  // middle 3 'reg opcode' bits
+  switch (subop) {
+  case 4: {  // shift left r/m32 by CL
+    trace(90, "run") << "subop: shift left by CL bits" << end();
+    uint8_t count = next() & 0x1f;
+    // OF is only defined if count is 1
+    if (count == 1) {
+      bool msb = (*arg1 & 0x80000000) >> 1;
+      bool pnsb = (*arg1 & 0x40000000);
+      OF = (msb != pnsb);
+    }
+    *arg1 = (*arg1 << count);
+    ZF = (*arg1 == 0);
+    SF = (*arg1 < 0);
+    trace(90, "run") << "storing 0x" << HEXWORD << *arg1 << end();
+    break;
+  }
+  // End Op c1 Subops
+  default:
+    cerr << "unrecognized sub-opcode after c1: " << NUM(subop) << '\n';
+    exit(1);
+  }
+  break;
+}
+
+//:: shift right arithmetic
+
+:(scenario shift_right_arithmetic_r32_with_imm8)
+% Reg[EBX].i = 26;
+== 0x1
+# op  ModR/M  SIB   displacement  immediate
+  c1  fb                          01          # negate EBX
+# ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)
++run: operate on r/m32
++run: r/m32 is EBX
++run: subop: shift right by CL bits, while preserving sign
++run: storing 0x0000000d
+
+:(before "End Op c1 Subops")
+case 7: {  // shift right r/m32 by CL, preserving sign
+  trace(90, "run") << "subop: shift right by CL bits, while preserving sign" << end();
+  uint8_t count = next() & 0x1f;
+  *arg1 = (*arg1 >> count);
+  ZF = (*arg1 == 0);
+  SF = (*arg1 < 0);
+  // OF is only defined if count is 1
+  if (count == 1) OF = false;
+  trace(90, "run") << "storing 0x" << HEXWORD << *arg1 << end();
+  break;
+}
+
+:(scenario shift_right_arithmetic_odd_r32_with_imm8)
+% Reg[EBX].i = 27;
+== 0x1
+# op  ModR/M  SIB   displacement  immediate
+  c1  fb                          01          # negate EBX
+# ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)
++run: operate on r/m32
++run: r/m32 is EBX
++run: subop: shift right by CL bits, while preserving sign
+# result: 13
++run: storing 0x0000000d
+
+:(scenario shift_right_arithmetic_negative_r32_with_imm8)
+% Reg[EBX].i = 0xfffffffd;  // -3
+== 0x1
+# op  ModR/M  SIB   displacement  immediate
+  c1  fb                          01          # negate EBX
+# ModR/M in binary: 11 (direct mode) 111 (subop shift right arithmetic) 011 (dest EBX)
++run: operate on r/m32
++run: r/m32 is EBX
++run: subop: shift right by CL bits, while preserving sign
+# result: -2
++run: storing 0xfffffffe
+
+//:: shift right logical
+
+:(scenario shift_right_logical_r32_with_imm8)
+% Reg[EBX].i = 26;
+== 0x1
+# op  ModR/M  SIB   displacement  immediate
+  c1  eb                          01          # negate EBX
+# ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)
++run: operate on r/m32
++run: r/m32 is EBX
++run: subop: shift right by CL bits, while padding zeroes
++run: storing 0x0000000d
+
+:(before "End Op c1 Subops")
+case 5: {  // shift right r/m32 by CL, preserving sign
+  trace(90, "run") << "subop: shift right by CL bits, while padding zeroes" << end();
+  uint8_t count = next() & 0x1f;
+  // OF is only defined if count is 1
+  if (count == 1) {
+    bool msb = (*arg1 & 0x80000000) >> 1;
+    bool pnsb = (*arg1 & 0x40000000);
+    OF = (msb != pnsb);
+  }
+  uint32_t* uarg1 = reinterpret_cast<uint32_t*>(arg1);
+  *uarg1 = (*uarg1 >> count);
+  ZF = (*uarg1 == 0);
+  // result is always positive by definition
+  SF = false;
+  trace(90, "run") << "storing 0x" << HEXWORD << *arg1 << end();
+  break;
+}
+
+:(scenario shift_right_logical_odd_r32_with_imm8)
+% Reg[EBX].i = 27;
+== 0x1
+# op  ModR/M  SIB   displacement  immediate
+  c1  eb                          01          # negate EBX
+# ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)
++run: operate on r/m32
++run: r/m32 is EBX
++run: subop: shift right by CL bits, while padding zeroes
+# result: 13
++run: storing 0x0000000d
+
+:(scenario shift_right_logical_negative_r32_with_imm8)
+% Reg[EBX].i = 0xfffffffd;
+== 0x1
+# op  ModR/M  SIB   displacement  immediate
+  c1  eb                          01          # negate EBX
+# ModR/M in binary: 11 (direct mode) 101 (subop shift right logical) 011 (dest EBX)
++run: operate on r/m32
++run: r/m32 is EBX
++run: subop: shift right by CL bits, while padding zeroes
++run: storing 0x7ffffffe
+
 //:: and
 
 :(before "End Initialize Op Names")
diff --git a/subx/031check_operands.cc b/subx/031check_operands.cc
index f59fb005..949bc533 100644
--- a/subx/031check_operands.cc
+++ b/subx/031check_operands.cc
@@ -212,18 +212,24 @@ void init_permitted_operands() {
   // pop
   put(Permitted_operands, "8f", 0x01);
 
-  //// Class O: op, ModR/M and subop (not r32)
+  //// Class N: op, ModR/M and subop (not r32)
   //  imm32 imm8  disp32 |disp16  disp8 subop modrm
   //  0     0     0      |0       0     1     1
+  put(Permitted_operands, "d3", 0x03);  // shift
   put(Permitted_operands, "f7", 0x03);  // test/not/mul/div
   put(Permitted_operands, "ff", 0x03);  // jump/push/call
 
-  //// Class N: op, ModR/M and imm32
+  //// Class O: op, ModR/M, subop (not r32) and imm8
+  //  imm32 imm8  disp32 |disp16  disp8 subop modrm
+  //  0     1     0      |0       0     1     1
+  put(Permitted_operands, "c1", 0x23);  // combine
+
+  //// Class P: op, ModR/M and imm32
   //  imm32 imm8  disp32 |disp16  disp8 subop modrm
   //  1     0     0      |0       0     0     1
   put(Permitted_operands, "c7", 0x41);  // copy
 
-  //// Class P: op, ModR/M, subop (not r32) and imm32
+  //// Class Q: op, ModR/M, subop (not r32) and imm32
   //  imm32 imm8  disp32 |disp16  disp8 subop modrm
   //  1     0     0      |0       0     1     1
   put(Permitted_operands, "81", 0x43);  // combine
diff --git a/subx/063print-byte.subx b/subx/063print-byte.subx
new file mode 100644
index 00000000..89f9e103
--- /dev/null
+++ b/subx/063print-byte.subx
@@ -0,0 +1,139 @@
+# Print the (hex) textual representation of the lowest byte of a number.
+
+== code
+#   instruction                     effective address                                                   register    displacement    immediate
+# . op          subop               mod             rm32          base        index         scale       r32
+# . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
+
+# main:
+    e8/call  run-tests/disp32  # 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.
+    # syscall(exit, Num-test-failures)
+    8b/copy                         0/mod/indirect  5/rm32/.disp32            .             .           3/r32/EBX   Num-test-failures/disp32          # copy *Num-test-failures to EBX
+    b8/copy-to-EAX  1/imm32
+    cd/syscall  0x80/imm8
+
+print-byte:  # f : (address buffered-file), n : num -> <void>
+    # . prolog
+    55/push-EBP
+    89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
+    # . save registers
+    50/push-EAX
+    # AL = convert upper nibble to hex
+    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           0/r32/EAX   0xc/disp8       .                 # copy *(EBP+12) to EAX
+    c1/shift    5/subop/logic-right 3/mod/direct    0/rm32/EAX    .           .             .           .           .               4/imm8            # shift EAX right by 4 bits, while padding zeroes
+    # . hex-char(AL)
+    # . . push args
+    50/push-EAX
+    # . . call
+    e8/call  hex-char/disp32
+    # . . discard args
+    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
+    # write-byte(f, AL)
+    # . . push args
+    50/push-EAX
+    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0x8/disp8       .                 # push *(EBP+8)
+    # . . call
+    e8/call  write-byte/disp32
+    # . . discard args
+    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
+    # AL = convert lower nibble to hex
+    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           0/r32/EAX   0xc/disp8       .                 # copy *(EBP+12) to EAX
+    25/and-EAX  0xf/imm32
+    # . hex-char(AL)
+    # . . push args
+    50/push-EAX
+    # . . call
+    e8/call  hex-char/disp32
+    # . . discard args
+    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
+    # write-byte(f, AL)
+    # . . push args
+    50/push-EAX
+    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0x8/disp8       .                 # push *(EBP+8)
+    # . . call
+    e8/call  write-byte/disp32
+    # . . discard args
+    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
+    # . restore registers
+    59/pop-to-ECX
+    58/pop-to-EAX
+    # . epilog
+    89/copy                         3/mod/direct    4/rm32/ESP    .           .             .           5/r32/EBP   .               .                 # copy EBP to ESP
+    5d/pop-to-EBP
+    c3/return
+
+# extract lowest 4 bits and convert to 8-byte ascii
+# return 0xffffffff if more than 4 bits are set
+hex-char:  # n : num -> char_or_error/EAX
+    # . prolog
+    55/push-EBP
+    89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
+    # EAX = n
+    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           0/r32/EAX   8/disp8         .                 # copy *(EBP+8) to EAX
+    # if it's <= 9 add '0' to it
+    81          7/subop/compare     3/mod/direct    0/rm32/EAX    .           .             .           .           .               0x9/imm32         # compare EAX
+    7f/jump-if-greater  $hex-char:check2/disp8
+    05/add-to-EAX  0x30/imm32/'0'
+    eb/jump  $hex-char:end/disp8
+$hex-char:check2:
+    # else if it's <= 15 add ('a' - 10) to it
+    81          7/subop/compare     3/mod/direct    0/rm32/EAX    .           .             .           .           .               0xf/imm32         # compare EAX
+    7f/jump-if-greater  $hex-char:error/disp8
+    05/add-to-EAX  0x57/imm32  # 'a' - 10
+    eb/jump  $hex-char:end/disp8
+$hex-char:error:
+    # otherwise return 0xffffffff
+    b8/copy-to-EAX  0xffffffff/imm32
+$hex-char:end:
+    # . epilog
+    89/copy                         3/mod/direct    4/rm32/ESP    .           .             .           5/r32/EBP   .               .                 # copy EBP to ESP
+    5d/pop-to-EBP
+    c3/return
+
+test-print-byte:
+    # - check that print-byte prints the hex textual representation
+    # setup
+    # . clear-stream(_test-stream)
+    # . . push args
+    68/push  _test-stream/imm32
+    # . . call
+    e8/call  clear-stream/disp32
+    # . . discard args
+    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
+    # . clear-stream(_test-buffered-file+4)
+    # . . push args
+    b8/copy-to-EAX  _test-buffered-file/imm32
+    05/add-to-EAX  4/imm32
+    50/push-EAX
+    # . . call
+    e8/call  clear-stream/disp32
+    # . . discard args
+    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
+    # print-byte(_test-buffered-file, 0xa)  # exercises digit, non-digit as well as leading zero
+    # . . push args
+    68/push  0xa/imm32
+    68/push  _test-buffered-file/imm32
+    # . . call
+    e8/call  print-byte/disp32
+    # . . discard args
+    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
+    # flush(_test-buffered-file)
+    # . . push args
+    68/push  _test-buffered-file/imm32
+    # . . call
+    e8/call  flush/disp32
+    # . . discard args
+    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
+    # check-ints-equal(*_test-stream->data, '0a', msg)
+    # . . push args
+    68/push  "F - test-print-byte"/imm32
+    68/push  0x6130/imm32/0a
+    # . . push *_test-stream->data
+    b8/copy-to-EAX  _test-stream/imm32
+    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX    .           .             .           .           0xc/disp8       .                 # push *(EAX+12)
+    # . . call
+    e8/call  check-ints-equal/disp32
+    # . . discard args
+    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
+    # . end
+    c3/return
diff --git a/subx/opcodes b/subx/opcodes
index 94d9c5f3..3437f30a 100644
--- a/subx/opcodes
+++ b/subx/opcodes
@@ -72,9 +72,11 @@ Opcodes currently supported by SubX:
   bd: copy imm32 to EBP (mov)
   be: copy imm32 to ESI (mov)
   bf: copy imm32 to EDI (mov)
+  c1: shift rm32 by imm8 bits depending on subop (sal/sar/shl/shr)
   c3: return from most recent unfinished call (ret)
   c7: copy imm32 to rm32 (mov)
   cd: software interrupt (int)
+  d3: shift rm32 by CL bits depending on subop (sal/sar/shl/shr)
   e8: call disp32 (call)
   e9: jump disp32 bytes away (jmp)
   eb: jump disp8 bytes away (jmp)
author	Kartik Agaram <vc@akkartik.com>	2018-12-03 23:26:56 -0800
committer	Kartik Agaram <vc@akkartik.com>	2018-12-03 23:26:56 -0800
commit	5f3b3e7aea4174f13da9b430538564c68257b647 (patch)
tree	64b0ca70a7508aa10a008ad7d996f5d4f38214c8
parent	ee73f5eb31e9dd5a185da097bd990ac94c3d282b (diff)
download	mu-5f3b3e7aea4174f13da9b430538564c68257b647.tar.gz