about summary refs log tree commit diff stats
path: root/html
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2019-01-21 00:59:05 -0800
committerKartik Agaram <vc@akkartik.com>2019-01-21 00:59:05 -0800
commit95540b2452f1bb76e351c626400c4af2f2810d15 (patch)
treeb826ad08a93511ae0093d3cab08ff711895f139e /html
parentf5fce35ebfa8518a8c36ca8822e4d3791ff6fc00 (diff)
downloadmu-95540b2452f1bb76e351c626400c4af2f2810d15.tar.gz
4942
Diffstat (limited to 'html')
-rw-r--r--html/subx/030---operands.cc.html2
-rw-r--r--html/subx/031check_operands.cc.html619
-rw-r--r--html/subx/032check_operand_bounds.cc.html2
-rw-r--r--html/subx/039debug.cc.html38
4 files changed, 337 insertions, 324 deletions
diff --git a/html/subx/030---operands.cc.html b/html/subx/030---operands.cc.html
index 2d7d4916..6567df13 100644
--- a/html/subx/030---operands.cc.html
+++ b/html/subx/030---operands.cc.html
@@ -79,7 +79,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#L448'>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#L455'>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 a8ac3502..cf54310e 100644
--- a/html/subx/031check_operands.cc.html
+++ b/html/subx/031check_operands.cc.html
@@ -89,14 +89,14 @@ if ('onhashchange' in window) {
 <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#L514'>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#L527'>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#L579'>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#L592'>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#L102'>starts_with</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span>
 <span id="L40" class="LineNr"> 40 </span>    op<span class="Delimiter">.</span>data = op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
@@ -310,8 +310,8 @@ if ('onhashchange' in window) {
 <span id="L248" class="LineNr">248 </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="L249" class="LineNr">249 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
 <span id="L250" class="LineNr">250 </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#L64'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L251" class="LineNr">251 </span>    <a href='031check_operands.cc.html#L347'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L252" class="LineNr">252 </span>    <a href='031check_operands.cc.html#L373'>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>    <a href='031check_operands.cc.html#L354'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L252" class="LineNr">252 </span>    <a href='031check_operands.cc.html#L380'>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="L253" class="LineNr">253 </span>  <span class="Delimiter">}</span>
 <span id="L254" class="LineNr">254 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L255" class="LineNr">255 </span>    <a href='031check_operands.cc.html#L261'>compare_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
@@ -321,8 +321,8 @@ if ('onhashchange' in window) {
 <span id="L259" class="LineNr">259 </span><span class="Comment">//: Many instructions can be checked just by comparing bitvectors.</span>
 <span id="L260" class="LineNr">260 </span>
 <span id="L261" class="LineNr">261 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L261'>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="L262" class="LineNr">262 </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#L296'>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="L263" class="LineNr">263 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L287'>computed_expected_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='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#L297'>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="L263" class="LineNr">263 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L287'>compute_expected_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
 <span id="L264" class="LineNr">264 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
 <span id="L265" class="LineNr">265 </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="L266" class="LineNr">266 </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#L71'>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>
@@ -346,311 +346,324 @@ if ('onhashchange' in window) {
 <span id="L284" class="LineNr">284 </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="L285" class="LineNr">285 </span><span class="Delimiter">}</span>
 <span id="L286" class="LineNr">286 </span>
-<span id="L287" class="LineNr">287 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L287'>computed_expected_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="L288" class="LineNr">288 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L289" class="LineNr">289 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L290" class="LineNr">290 </span>    bitvector = bitvector | <a href='031check_operands.cc.html#L313'>expected_bit_for_received_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="L291" class="LineNr">291 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L95'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L292" class="LineNr">292 </span>  <span class="Delimiter">}</span>
-<span id="L293" class="LineNr">293 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
-<span id="L294" class="LineNr">294 </span><span class="Delimiter">}</span>
-<span id="L295" class="LineNr">295 </span>
-<span id="L296" class="LineNr">296 </span><span class="Normal">bool</span> <a href='031check_operands.cc.html#L296'>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="L297" class="LineNr">297 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> &gt; <a href='031check_operands.cc.html#L300'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L298" class="LineNr">298 </span><span class="Delimiter">}</span>
-<span id="L299" class="LineNr">299 </span>
-<span id="L300" class="LineNr">300 </span><span class="Normal">int</span> <a href='031check_operands.cc.html#L300'>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="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">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="L302" class="LineNr">302 </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="L303" class="LineNr">303 </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="L304" class="LineNr">304 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
-<span id="L305" class="LineNr">305 </span>    <span class="Normal">else</span>
-<span id="L306" class="LineNr">306 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L307" class="LineNr">307 </span>  <span class="Delimiter">}</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L309" class="LineNr">309 </span><span class="Delimiter">}</span>
-<span id="L310" class="LineNr">310 </span>
-<span id="L311" class="LineNr">311 </span><span class="Comment">// Scan the metadata of 'w' and return the expected bit corresponding to any operand type.</span>
-<span id="L312" class="LineNr">312 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
-<span id="L313" class="LineNr">313 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L313'>expected_bit_for_received_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L314" class="LineNr">314 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L315" class="LineNr">315 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L316" class="LineNr">316 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L317" class="LineNr">317 </span>    string<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> curr = w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L318" class="LineNr">318 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr == <span class="Constant">&quot;mod&quot;</span> || curr == <span class="Constant">&quot;rm32&quot;</span> || curr == <span class="Constant">&quot;r32&quot;</span> || curr == <span class="Constant">&quot;scale&quot;</span> || curr == <span class="Constant">&quot;index&quot;</span> || curr == <span class="Constant">&quot;base&quot;</span><span class="Delimiter">)</span>
-<span id="L319" class="LineNr">319 </span>      curr = <span class="Constant">&quot;modrm&quot;</span><span class="Delimiter">;</span>
-<span id="L320" class="LineNr">320 </span>    <span class="Normal">else</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#L75'>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="L321" class="LineNr">321 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L322" class="LineNr">322 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L323" class="LineNr">323 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L95'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
-<span id="L324" class="LineNr">324 </span>    <span class="Delimiter">}</span>
-<span id="L325" class="LineNr">325 </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#L75'>Operand_type</a></span><span class="Delimiter">,</span> curr<span class="Delimiter">));</span>
-<span id="L326" class="LineNr">326 </span>    found =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L327" class="LineNr">327 </span>  <span class="Delimiter">}</span>
-<span id="L328" class="LineNr">328 </span>  <span class="Identifier">return</span> bv<span class="Delimiter">;</span>
-<span id="L329" class="LineNr">329 </span><span class="Delimiter">}</span>
-<span id="L330" class="LineNr">330 </span>
-<span id="L331" class="LineNr">331 </span><span class="Delimiter">:(scenario conflicting_operand_type)</span>
-<span id="L332" class="LineNr">332 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L333" class="LineNr">333 </span>== <span class="Constant">0x1</span>
-<span id="L334" class="LineNr">334 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
-<span id="L335" class="LineNr">335 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
-<span id="L336" class="LineNr">336 </span>
-<span id="L337" class="LineNr">337 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
-<span id="L338" class="LineNr">338 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
-<span id="L339" class="LineNr">339 </span>
-<span id="L340" class="LineNr">340 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
-<span id="L341" class="LineNr">341 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L342" class="LineNr">342 </span>== <span class="Constant">0x1</span>
-<span id="L343" class="LineNr">343 </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="L344" class="LineNr">344 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing mod operand</span>
-<span id="L345" class="LineNr">345 </span>
-<span id="L346" class="LineNr">346 </span><span class="Delimiter">:(code)</span>
-<span id="L347" class="LineNr">347 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L347'>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="L348" class="LineNr">348 </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="L349" class="LineNr">349 </span>  <a href='031check_operands.cc.html#L407'>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="L350" class="LineNr">350 </span>  <a href='031check_operands.cc.html#L407'>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="L351" class="LineNr">351 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
-<span id="L352" class="LineNr">352 </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="L353" class="LineNr">353 </span>    <a href='031check_operands.cc.html#L407'>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="L354" class="LineNr">354 </span>    <a href='031check_operands.cc.html#L412'>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="L355" class="LineNr">355 </span>  <span class="Delimiter">}</span>
-<span id="L356" class="LineNr">356 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L357" class="LineNr">357 </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="L358" class="LineNr">358 </span>  <span class="Comment">// SIB byte checks</span>
-<span id="L359" class="LineNr">359 </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="L360" class="LineNr">360 </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="L361" class="LineNr">361 </span>    <a href='031check_operands.cc.html#L407'>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="L362" class="LineNr">362 </span>    <a href='031check_operands.cc.html#L407'>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="L363" class="LineNr">363 </span>  <span class="Delimiter">}</span>
-<span id="L364" class="LineNr">364 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L365" class="LineNr">365 </span>    <a href='031check_operands.cc.html#L412'>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="L366" class="LineNr">366 </span>    <a href='031check_operands.cc.html#L412'>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="L367" class="LineNr">367 </span>  <span class="Delimiter">}</span>
-<span id="L368" class="LineNr">368 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span>
-<span id="L369" class="LineNr">369 </span><span class="Delimiter">}</span>
-<span id="L370" class="LineNr">370 </span>
-<span id="L371" class="LineNr">371 </span><span class="Comment">// same as compare_bitvector, with one additional exception for modrm-based</span>
-<span id="L372" class="LineNr">372 </span><span class="Comment">// instructions: they may use an extra displacement on occasion</span>
-<span id="L373" class="LineNr">373 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L373'>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="L374" class="LineNr">374 </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#L296'>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="L375" class="LineNr">375 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L287'>computed_expected_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L376" class="LineNr">376 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L377" class="LineNr">377 </span>  <span class="Comment">// update 'expected' bitvector for the additional exception</span>
-<span id="L378" class="LineNr">378 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L379" class="LineNr">379 </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="L380" class="LineNr">380 </span>    <span class="Normal">switch</span> <span class="Delimiter">(</span>mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L381" class="LineNr">381 </span>    <span class="Normal">case</span> <span class="Constant">0</span>:
-<span id="L382" class="LineNr">382 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">)</span> &amp;&amp; <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 class="Constant">5</span><span class="Delimiter">)</span>
-<span id="L383" class="LineNr">383 </span>        expected |= <span class="Delimiter">(</span><span class="Constant">1</span>&lt;&lt;DISP32<span class="Delimiter">);</span>
-<span id="L384" class="LineNr">384 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L385" class="LineNr">385 </span>    <span class="Normal">case</span> <span class="Constant">1</span>:
-<span id="L386" class="LineNr">386 </span>      expected |= <span class="Delimiter">(</span><span class="Constant">1</span>&lt;&lt;DISP8<span class="Delimiter">);</span>
-<span id="L387" class="LineNr">387 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L388" class="LineNr">388 </span>    <span class="Normal">case</span> <span class="Constant">2</span>:
-<span id="L389" class="LineNr">389 </span>      expected |= <span class="Delimiter">(</span><span class="Constant">1</span>&lt;&lt;DISP32<span class="Delimiter">);</span>
-<span id="L390" class="LineNr">390 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L391" class="LineNr">391 </span>    <span class="Delimiter">}</span>
-<span id="L392" class="LineNr">392 </span>  <span class="Delimiter">}</span>
-<span id="L393" class="LineNr">393 </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="L394" class="LineNr">394 </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#L71'>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="L395" class="LineNr">395 </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="L396" class="LineNr">396 </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="L397" class="LineNr">397 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L74'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L398" class="LineNr">398 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>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="L399" class="LineNr">399 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L279'>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="L400" class="LineNr">400 </span>    <span class="Normal">else</span>
-<span id="L401" class="LineNr">401 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L279'>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="L402" class="LineNr">402 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L403" class="LineNr">403 </span>  <span class="Delimiter">}</span>
-<span id="L404" class="LineNr">404 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L405" class="LineNr">405 </span><span class="Delimiter">}</span>
-<span id="L406" class="LineNr">406 </span>
-<span id="L407" class="LineNr">407 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L407'>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="L408" class="LineNr">408 </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="L409" class="LineNr">409 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L279'>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="L410" class="LineNr">410 </span><span class="Delimiter">}</span>
-<span id="L411" class="LineNr">411 </span>
-<span id="L412" class="LineNr">412 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L412'>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="L413" class="LineNr">413 </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="L414" class="LineNr">414 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L279'>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="L415" class="LineNr">415 </span><span class="Delimiter">}</span>
-<span id="L416" class="LineNr">416 </span>
-<span id="L417" class="LineNr">417 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L418" class="LineNr">418 </span><span class="Delimiter">:(scenario modrm_with_displacement)</span>
-<span id="L419" class="LineNr">419 </span><span class="Special">% Reg[EAX].u = 0x1;</span>
-<span id="L420" class="LineNr">420 </span>== <span class="Constant">0x1</span>
-<span id="L421" class="LineNr">421 </span><span class="Comment"># just avoid null pointer</span>
-<span id="L422" class="LineNr">422 </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="L423" class="LineNr">423 </span>$error: <span class="Constant">0</span>
-<span id="L424" class="LineNr">424 </span>
-<span id="L425" class="LineNr">425 </span><span class="Delimiter">:(scenario check_missing_disp8)</span>
-<span id="L426" class="LineNr">426 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L287" class="LineNr">287 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L287'>compute_expected_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="L288" class="LineNr">288 </span>  set&lt;string&gt; operands_found<span class="Delimiter">;</span>
+<span id="L289" class="LineNr">289 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L290" class="LineNr">290 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L291" class="LineNr">291 </span>    bitvector = bitvector | <a href='031check_operands.cc.html#L314'>expected_bit_for_received_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> operands_found<span class="Delimiter">,</span> inst<span class="Delimiter">);</span>
+<span id="L292" class="LineNr">292 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L95'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L293" class="LineNr">293 </span>  <span class="Delimiter">}</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
+<span id="L295" class="LineNr">295 </span><span class="Delimiter">}</span>
+<span id="L296" class="LineNr">296 </span>
+<span id="L297" class="LineNr">297 </span><span class="Normal">bool</span> <a href='031check_operands.cc.html#L297'>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="L298" class="LineNr">298 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> &gt; <a href='031check_operands.cc.html#L301'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L299" class="LineNr">299 </span><span class="Delimiter">}</span>
+<span id="L300" class="LineNr">300 </span>
+<span id="L301" class="LineNr">301 </span><span class="Normal">int</span> <a href='031check_operands.cc.html#L301'>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="L302" class="LineNr">302 </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="L303" class="LineNr">303 </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="L304" class="LineNr">304 </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="L305" class="LineNr">305 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
+<span id="L306" class="LineNr">306 </span>    <span class="Normal">else</span>
+<span id="L307" class="LineNr">307 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L308" class="LineNr">308 </span>  <span class="Delimiter">}</span>
+<span id="L309" class="LineNr">309 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L310" class="LineNr">310 </span><span class="Delimiter">}</span>
+<span id="L311" class="LineNr">311 </span>
+<span id="L312" class="LineNr">312 </span><span class="Comment">// Scan the metadata of 'w' and return the expected bit corresponding to any operand type.</span>
+<span id="L313" class="LineNr">313 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
+<span id="L314" class="LineNr">314 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L314'>expected_bit_for_received_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">,</span> set&lt;string&gt;&amp; instruction_operands<span class="Delimiter">,</span> <span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L316" class="LineNr">316 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L317" class="LineNr">317 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L318" class="LineNr">318 </span>    string<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> curr = w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L319" class="LineNr">319 </span>    string expected_metadata = curr<span class="Delimiter">;</span>
+<span id="L320" class="LineNr">320 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr == <span class="Constant">&quot;mod&quot;</span> || curr == <span class="Constant">&quot;rm32&quot;</span> || curr == <span class="Constant">&quot;r32&quot;</span> || curr == <span class="Constant">&quot;scale&quot;</span> || curr == <span class="Constant">&quot;index&quot;</span> || curr == <span class="Constant">&quot;base&quot;</span><span class="Delimiter">)</span>
+<span id="L321" class="LineNr">321 </span>      expected_metadata = <span class="Constant">&quot;modrm&quot;</span><span class="Delimiter">;</span>
+<span id="L322" class="LineNr">322 </span>    <span class="Normal">else</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#L75'>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="L323" class="LineNr">323 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L324" class="LineNr">324 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L325" class="LineNr">325 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L95'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
+<span id="L326" class="LineNr">326 </span>    <span class="Delimiter">}</span>
+<span id="L327" class="LineNr">327 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>instruction_operands<span class="Delimiter">.</span>find<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> != instruction_operands<span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L328" class="LineNr">328 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': duplicate &quot;</span> &lt;&lt; curr &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L329" class="LineNr">329 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L95'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
+<span id="L330" class="LineNr">330 </span>    <span class="Delimiter">}</span>
+<span id="L331" class="LineNr">331 </span>    instruction_operands<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L332" class="LineNr">332 </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#L75'>Operand_type</a></span><span class="Delimiter">,</span> expected_metadata<span class="Delimiter">));</span>
+<span id="L333" class="LineNr">333 </span>    found =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L334" class="LineNr">334 </span>  <span class="Delimiter">}</span>
+<span id="L335" class="LineNr">335 </span>  <span class="Identifier">return</span> bv<span class="Delimiter">;</span>
+<span id="L336" class="LineNr">336 </span><span class="Delimiter">}</span>
+<span id="L337" class="LineNr">337 </span>
+<span id="L338" class="LineNr">338 </span><span class="Delimiter">:(scenario conflicting_operand_type)</span>
+<span id="L339" class="LineNr">339 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L340" class="LineNr">340 </span>== <span class="Constant">0x1</span>
+<span id="L341" class="LineNr">341 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
+<span id="L342" class="LineNr">342 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
+<span id="L343" class="LineNr">343 </span>
+<span id="L344" class="LineNr">344 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
+<span id="L345" class="LineNr">345 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
+<span id="L346" class="LineNr">346 </span>
+<span id="L347" class="LineNr">347 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
+<span id="L348" class="LineNr">348 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L349" class="LineNr">349 </span>== <span class="Constant">0x1</span>
+<span id="L350" class="LineNr">350 </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="L351" class="LineNr">351 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing mod operand</span>
+<span id="L352" class="LineNr">352 </span>
+<span id="L353" class="LineNr">353 </span><span class="Delimiter">:(code)</span>
+<span id="L354" class="LineNr">354 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L354'>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="L355" class="LineNr">355 </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="L356" class="LineNr">356 </span>  <a href='031check_operands.cc.html#L414'>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="L357" class="LineNr">357 </span>  <a href='031check_operands.cc.html#L414'>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="L358" class="LineNr">358 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
+<span id="L359" class="LineNr">359 </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="L360" class="LineNr">360 </span>    <a href='031check_operands.cc.html#L414'>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="L361" class="LineNr">361 </span>    <a href='031check_operands.cc.html#L419'>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="L362" class="LineNr">362 </span>  <span class="Delimiter">}</span>
+<span id="L363" class="LineNr">363 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L364" class="LineNr">364 </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="L365" class="LineNr">365 </span>  <span class="Comment">// SIB byte checks</span>
+<span id="L366" class="LineNr">366 </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="L367" class="LineNr">367 </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="L368" class="LineNr">368 </span>    <a href='031check_operands.cc.html#L414'>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="L369" class="LineNr">369 </span>    <a href='031check_operands.cc.html#L414'>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="L370" class="LineNr">370 </span>  <span class="Delimiter">}</span>
+<span id="L371" class="LineNr">371 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L372" class="LineNr">372 </span>    <a href='031check_operands.cc.html#L419'>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="L373" class="LineNr">373 </span>    <a href='031check_operands.cc.html#L419'>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="L374" class="LineNr">374 </span>  <span class="Delimiter">}</span>
+<span id="L375" class="LineNr">375 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span>
+<span id="L376" class="LineNr">376 </span><span class="Delimiter">}</span>
+<span id="L377" class="LineNr">377 </span>
+<span id="L378" class="LineNr">378 </span><span class="Comment">// same as compare_bitvector, with one additional exception for modrm-based</span>
+<span id="L379" class="LineNr">379 </span><span class="Comment">// instructions: they may use an extra displacement on occasion</span>
+<span id="L380" class="LineNr">380 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L380'>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="L381" class="LineNr">381 </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#L297'>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="L382" class="LineNr">382 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L287'>compute_expected_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L383" class="LineNr">383 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L384" class="LineNr">384 </span>  <span class="Comment">// update 'expected' bitvector for the additional exception</span>
+<span id="L385" class="LineNr">385 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L386" class="LineNr">386 </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="L387" class="LineNr">387 </span>    <span class="Normal">switch</span> <span class="Delimiter">(</span>mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L388" class="LineNr">388 </span>    <span class="Normal">case</span> <span class="Constant">0</span>:
+<span id="L389" class="LineNr">389 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">)</span> &amp;&amp; <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 class="Constant">5</span><span class="Delimiter">)</span>
+<span id="L390" class="LineNr">390 </span>        expected |= <span class="Delimiter">(</span><span class="Constant">1</span>&lt;&lt;DISP32<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="Normal">case</span> <span class="Constant">1</span>:
+<span id="L393" class="LineNr">393 </span>      expected |= <span class="Delimiter">(</span><span class="Constant">1</span>&lt;&lt;DISP8<span class="Delimiter">);</span>
+<span id="L394" class="LineNr">394 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L395" class="LineNr">395 </span>    <span class="Normal">case</span> <span class="Constant">2</span>:
+<span id="L396" class="LineNr">396 </span>      expected |= <span class="Delimiter">(</span><span class="Constant">1</span>&lt;&lt;DISP32<span class="Delimiter">);</span>
+<span id="L397" class="LineNr">397 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L398" class="LineNr">398 </span>    <span class="Delimiter">}</span>
+<span id="L399" class="LineNr">399 </span>  <span class="Delimiter">}</span>
+<span id="L400" class="LineNr">400 </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="L401" class="LineNr">401 </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#L71'>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="L402" class="LineNr">402 </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="L403" class="LineNr">403 </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="L404" class="LineNr">404 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L74'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L405" class="LineNr">405 </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="L406" class="LineNr">406 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L279'>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="L407" class="LineNr">407 </span>    <span class="Normal">else</span>
+<span id="L408" class="LineNr">408 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L279'>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="L409" class="LineNr">409 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L410" class="LineNr">410 </span>  <span class="Delimiter">}</span>
+<span id="L411" class="LineNr">411 </span>  <span class="Comment">// ignore settings in any unused bits</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="Normal">void</span> <a href='031check_operands.cc.html#L414'>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="L415" class="LineNr">415 </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="L416" class="LineNr">416 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L279'>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="L417" class="LineNr">417 </span><span class="Delimiter">}</span>
+<span id="L418" class="LineNr">418 </span>
+<span id="L419" class="LineNr">419 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L419'>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="L420" class="LineNr">420 </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="L421" class="LineNr">421 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L279'>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="L422" class="LineNr">422 </span><span class="Delimiter">}</span>
+<span id="L423" class="LineNr">423 </span>
+<span id="L424" class="LineNr">424 </span><span class="Delimiter">:(scenarios transform)</span>
+<span id="L425" class="LineNr">425 </span><span class="Delimiter">:(scenario modrm_with_displacement)</span>
+<span id="L426" class="LineNr">426 </span><span class="Special">% Reg[EAX].u = 0x1;</span>
 <span id="L427" class="LineNr">427 </span>== <span class="Constant">0x1</span>
-<span id="L428" class="LineNr">428 </span><span class="Constant">89</span>/copy <span class="Constant">1</span>/mod/lookup+disp8 <span class="Constant">0</span>/rm32/EAX <span class="Constant">1</span>/r32/ECX  <span class="Comment"># missing disp8</span>
-<span id="L429" class="LineNr">429 </span><span class="traceContains">+error: '89/copy 1/mod/lookup+disp8 0/rm32/EAX 1/r32/ECX' (copy r32 to rm32): missing disp8 operand</span>
-<span id="L430" class="LineNr">430 </span>
-<span id="L431" class="LineNr">431 </span><span class="Delimiter">:(scenario check_missing_disp32)</span>
-<span id="L432" class="LineNr">432 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L433" class="LineNr">433 </span>== <span class="Constant">0x1</span>
-<span id="L434" class="LineNr">434 </span>8b/copy <span class="Constant">0</span>/mod/indirect <span class="Constant">5</span>/rm32/<span class="Delimiter">.</span>disp32 <span class="Constant">2</span>/r32/EDX  <span class="Comment"># missing disp32</span>
-<span id="L435" class="LineNr">435 </span><span class="traceContains">+error: '8b/copy 0/mod/indirect 5/rm32/.disp32 2/r32/EDX' (copy rm32 to r32): missing disp32 operand</span>
-<span id="L436" class="LineNr">436 </span><span class="Delimiter">:(scenarios run)</span>
+<span id="L428" class="LineNr">428 </span><span class="Comment"># just avoid null pointer</span>
+<span id="L429" class="LineNr">429 </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="L430" class="LineNr">430 </span>$error: <span class="Constant">0</span>
+<span id="L431" class="LineNr">431 </span>
+<span id="L432" class="LineNr">432 </span><span class="Delimiter">:(scenario check_missing_disp8)</span>
+<span id="L433" class="LineNr">433 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L434" class="LineNr">434 </span>== <span class="Constant">0x1</span>
+<span id="L435" class="LineNr">435 </span><span class="Constant">89</span>/copy <span class="Constant">1</span>/mod/lookup+disp8 <span class="Constant">0</span>/rm32/EAX <span class="Constant">1</span>/r32/ECX  <span class="Comment"># missing disp8</span>
+<span id="L436" class="LineNr">436 </span><span class="traceContains">+error: '89/copy 1/mod/lookup+disp8 0/rm32/EAX 1/r32/ECX' (copy r32 to rm32): missing disp8 operand</span>
 <span id="L437" class="LineNr">437 </span>
-<span id="L438" class="LineNr">438 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
+<span id="L438" class="LineNr">438 </span><span class="Delimiter">:(scenario check_missing_disp32)</span>
 <span id="L439" class="LineNr">439 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L440" class="LineNr">440 </span>== <span class="Constant">0x1</span>
-<span id="L441" class="LineNr">441 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/mod
-<span id="L442" class="LineNr">442 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
-<span id="L443" class="LineNr">443 </span>
-<span id="L444" class="LineNr">444 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
-<span id="L445" class="LineNr">445 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L446" class="LineNr">446 </span>== <span class="Constant">0x1</span>
-<span id="L447" class="LineNr">447 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/r32
-<span id="L448" class="LineNr">448 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
-<span id="L449" class="LineNr">449 </span>
-<span id="L450" class="LineNr">450 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
-<span id="L451" class="LineNr">451 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L452" class="LineNr">452 </span>== <span class="Constant">0x1</span>
-<span id="L453" class="LineNr">453 </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="L454" class="LineNr">454 </span><span class="traceContains">+error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing rm32 operand</span>
-<span id="L455" class="LineNr">455 </span>
-<span id="L456" class="LineNr">456 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
-<span id="L457" class="LineNr">457 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L458" class="LineNr">458 </span>== <span class="Constant">0x1</span>
-<span id="L459" class="LineNr">459 </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="L460" class="LineNr">460 </span><span class="traceContains">+error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing subop operand</span>
-<span id="L461" class="LineNr">461 </span>
-<span id="L462" class="LineNr">462 </span><span class="Delimiter">:(scenario check_missing_base_operand)</span>
-<span id="L463" class="LineNr">463 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L464" class="LineNr">464 </span>== <span class="Constant">0x1</span>
-<span id="L465" class="LineNr">465 </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="L466" class="LineNr">466 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing base operand</span>
-<span id="L467" class="LineNr">467 </span>
-<span id="L468" class="LineNr">468 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
-<span id="L469" class="LineNr">469 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L470" class="LineNr">470 </span>== <span class="Constant">0x1</span>
-<span id="L471" class="LineNr">471 </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="L472" class="LineNr">472 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing index operand</span>
-<span id="L473" class="LineNr">473 </span>
-<span id="L474" class="LineNr">474 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</span>
-<span id="L475" class="LineNr">475 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L476" class="LineNr">476 </span>== <span class="Constant">0x1</span>
-<span id="L477" class="LineNr">477 </span><span class="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="L478" class="LineNr">478 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing base operand</span>
-<span id="L479" class="LineNr">479 </span>
-<span id="L480" class="LineNr">480 </span><span class="Delimiter">:(scenario check_extra_displacement)</span>
-<span id="L481" class="LineNr">481 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L482" class="LineNr">482 </span>== <span class="Constant">0x1</span>
-<span id="L483" class="LineNr">483 </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="L484" class="LineNr">484 </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="L485" class="LineNr">485 </span>
-<span id="L486" class="LineNr">486 </span><span class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
-<span id="L487" class="LineNr">487 </span>== <span class="Constant">0x1</span>
-<span id="L488" class="LineNr">488 </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="L489" class="LineNr">489 </span>$error: <span class="Constant">0</span>
-<span id="L490" class="LineNr">490 </span>
-<span id="L491" class="LineNr">491 </span><span class="Delimiter">:(scenario extra_modrm)</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="Constant">59</span>/pop-to-ECX  <span class="Constant">3</span>/mod/direct <span class="Constant">1</span>/rm32/ECX <span class="Constant">4</span>/r32/ESP
-<span id="L495" class="LineNr">495 </span><span class="traceContains">+error: '59/pop-to-ECX 3/mod/direct 1/rm32/ECX 4/r32/ESP' (pop top of stack to ECX): unexpected modrm operand</span>
-<span id="L496" class="LineNr">496 </span>
-<span id="L497" class="LineNr">497 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
+<span id="L441" class="LineNr">441 </span>8b/copy <span class="Constant">0</span>/mod/indirect <span class="Constant">5</span>/rm32/<span class="Delimiter">.</span>disp32 <span class="Constant">2</span>/r32/EDX  <span class="Comment"># missing disp32</span>
+<span id="L442" class="LineNr">442 </span><span class="traceContains">+error: '8b/copy 0/mod/indirect 5/rm32/.disp32 2/r32/EDX' (copy rm32 to r32): missing disp32 operand</span>
+<span id="L443" class="LineNr">443 </span><span class="Delimiter">:(scenarios run)</span>
+<span id="L444" class="LineNr">444 </span>
+<span id="L445" class="LineNr">445 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
+<span id="L446" class="LineNr">446 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L447" class="LineNr">447 </span>== <span class="Constant">0x1</span>
+<span id="L448" class="LineNr">448 </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="L449" class="LineNr">449 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
+<span id="L450" class="LineNr">450 </span>
+<span id="L451" class="LineNr">451 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
+<span id="L452" class="LineNr">452 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L453" class="LineNr">453 </span>== <span class="Constant">0x1</span>
+<span id="L454" class="LineNr">454 </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="L455" class="LineNr">455 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
+<span id="L456" class="LineNr">456 </span>
+<span id="L457" class="LineNr">457 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
+<span id="L458" class="LineNr">458 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L459" class="LineNr">459 </span>== <span class="Constant">0x1</span>
+<span id="L460" class="LineNr">460 </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="L461" class="LineNr">461 </span><span class="traceContains">+error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing rm32 operand</span>
+<span id="L462" class="LineNr">462 </span>
+<span id="L463" class="LineNr">463 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
+<span id="L464" class="LineNr">464 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L465" class="LineNr">465 </span>== <span class="Constant">0x1</span>
+<span id="L466" class="LineNr">466 </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="L467" class="LineNr">467 </span><span class="traceContains">+error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing subop operand</span>
+<span id="L468" class="LineNr">468 </span>
+<span id="L469" class="LineNr">469 </span><span class="Delimiter">:(scenario check_missing_base_operand)</span>
+<span id="L470" class="LineNr">470 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L471" class="LineNr">471 </span>== <span class="Constant">0x1</span>
+<span id="L472" class="LineNr">472 </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="L473" class="LineNr">473 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing base operand</span>
+<span id="L474" class="LineNr">474 </span>
+<span id="L475" class="LineNr">475 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
+<span id="L476" class="LineNr">476 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L477" class="LineNr">477 </span>== <span class="Constant">0x1</span>
+<span id="L478" class="LineNr">478 </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="L479" class="LineNr">479 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing index operand</span>
+<span id="L480" class="LineNr">480 </span>
+<span id="L481" class="LineNr">481 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</span>
+<span id="L482" class="LineNr">482 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L483" class="LineNr">483 </span>== <span class="Constant">0x1</span>
+<span id="L484" class="LineNr">484 </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="L485" class="LineNr">485 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing base operand</span>
+<span id="L486" class="LineNr">486 </span>
+<span id="L487" class="LineNr">487 </span><span class="Delimiter">:(scenario check_extra_displacement)</span>
+<span id="L488" class="LineNr">488 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L489" class="LineNr">489 </span>== <span class="Constant">0x1</span>
+<span id="L490" class="LineNr">490 </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="L491" class="LineNr">491 </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="L492" class="LineNr">492 </span>
+<span id="L493" class="LineNr">493 </span><span class="Delimiter">:(scenario check_duplicate_operand)</span>
+<span id="L494" class="LineNr">494 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L495" class="LineNr">495 </span>== <span class="Constant">0x1</span>
+<span id="L496" class="LineNr">496 </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">1</span>/r32
+<span id="L497" class="LineNr">497 </span><span class="traceContains">+error: '89/copy 0/mod/indirect 0/rm32/EAX 1/r32/ECX 1/r32': duplicate r32 operand</span>
 <span id="L498" class="LineNr">498 </span>
-<span id="L499" class="LineNr">499 </span><span class="Delimiter">:(code)</span>
-<span id="L500" class="LineNr">500 </span><span class="Normal">void</span> check_operands_0f<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L501" class="LineNr">501 </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="L502" class="LineNr">502 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L503" class="LineNr">503 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L504" class="LineNr">504 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L505" class="LineNr">505 </span>  <span class="Delimiter">}</span>
-<span id="L506" class="LineNr">506 </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="L507" class="LineNr">507 </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="L508" class="LineNr">508 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown 2-byte opcode '0f &quot;</span> &lt;&lt; op<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L509" class="LineNr">509 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L510" class="LineNr">510 </span>  <span class="Delimiter">}</span>
-<span id="L511" class="LineNr">511 </span>  check_operands_0f<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L512" class="LineNr">512 </span><span class="Delimiter">}</span>
-<span id="L513" class="LineNr">513 </span>
-<span id="L514" class="LineNr">514 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L514'>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="L515" class="LineNr">515 </span>  <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L516" class="LineNr">516 </span><span class="Delimiter">}</span>
-<span id="L517" class="LineNr">517 </span>
-<span id="L518" class="LineNr">518 </span><span class="Delimiter">:(scenario check_missing_disp32_operand)</span>
-<span id="L519" class="LineNr">519 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L520" class="LineNr">520 </span>== <span class="Constant">0x1</span>
-<span id="L521" class="LineNr">521 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L522" class="LineNr">522 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L523" class="LineNr">523 </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="L524" class="LineNr">524 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                             <span class="Comment"># jmp if ZF to ??</span>
-<span id="L525" class="LineNr">525 </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 class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
+<span id="L500" class="LineNr">500 </span>== <span class="Constant">0x1</span>
+<span id="L501" class="LineNr">501 </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="L502" class="LineNr">502 </span>$error: <span class="Constant">0</span>
+<span id="L503" class="LineNr">503 </span>
+<span id="L504" class="LineNr">504 </span><span class="Delimiter">:(scenario extra_modrm)</span>
+<span id="L505" class="LineNr">505 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L506" class="LineNr">506 </span>== <span class="Constant">0x1</span>
+<span id="L507" class="LineNr">507 </span><span class="Constant">59</span>/pop-to-ECX  <span class="Constant">3</span>/mod/direct <span class="Constant">1</span>/rm32/ECX <span class="Constant">4</span>/r32/ESP
+<span id="L508" class="LineNr">508 </span><span class="traceContains">+error: '59/pop-to-ECX 3/mod/direct 1/rm32/ECX 4/r32/ESP' (pop top of stack to ECX): unexpected modrm operand</span>
+<span id="L509" class="LineNr">509 </span>
+<span id="L510" class="LineNr">510 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
+<span id="L511" class="LineNr">511 </span>
+<span id="L512" class="LineNr">512 </span><span class="Delimiter">:(code)</span>
+<span id="L513" class="LineNr">513 </span><span class="Normal">void</span> check_operands_0f<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L514" class="LineNr">514 </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="L515" class="LineNr">515 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L516" class="LineNr">516 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L517" class="LineNr">517 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L518" class="LineNr">518 </span>  <span class="Delimiter">}</span>
+<span id="L519" class="LineNr">519 </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="L520" class="LineNr">520 </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="L521" class="LineNr">521 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown 2-byte opcode '0f &quot;</span> &lt;&lt; op<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L522" class="LineNr">522 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L523" class="LineNr">523 </span>  <span class="Delimiter">}</span>
+<span id="L524" class="LineNr">524 </span>  check_operands_0f<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L525" class="LineNr">525 </span><span class="Delimiter">}</span>
 <span id="L526" class="LineNr">526 </span>
-<span id="L527" class="LineNr">527 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L528" class="LineNr">528 </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#L528'>Permitted_operands_0f</a></span><span class="Delimiter">;</span>
-<span id="L529" class="LineNr">529 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
-<span id="L530" class="LineNr">530 </span><span class="SalientComment">//// Class D: just op and disp32</span>
-<span id="L531" class="LineNr">531 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L532" class="LineNr">532 </span><span class="Comment">//  0     0     1      |0       0     0     0</span>
-<span id="L533" class="LineNr">533 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L528'>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="L534" class="LineNr">534 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L528'>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="L535" class="LineNr">535 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L528'>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="L536" class="LineNr">536 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L528'>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="L537" class="LineNr">537 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L528'>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="L538" class="LineNr">538 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L528'>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="L527" class="LineNr">527 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L527'>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="L528" class="LineNr">528 </span>  <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L529" class="LineNr">529 </span><span class="Delimiter">}</span>
+<span id="L530" class="LineNr">530 </span>
+<span id="L531" class="LineNr">531 </span><span class="Delimiter">:(scenario check_missing_disp32_operand)</span>
+<span id="L532" class="LineNr">532 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L533" class="LineNr">533 </span>== <span class="Constant">0x1</span>
+<span id="L534" class="LineNr">534 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L535" class="LineNr">535 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L536" class="LineNr">536 </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="L537" class="LineNr">537 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                             <span class="Comment"># jmp if ZF to ??</span>
+<span id="L538" class="LineNr">538 </span><span class="traceContains">+error: '0f 84' (jump disp32 bytes away if equal, if ZF is set): missing disp32 operand</span>
 <span id="L539" class="LineNr">539 </span>
-<span id="L540" class="LineNr">540 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
-<span id="L541" class="LineNr">541 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L542" class="LineNr">542 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
-<span id="L543" class="LineNr">543 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L528'>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="L544" class="LineNr">544 </span>
-<span id="L545" class="LineNr">545 </span><span class="Delimiter">:(code)</span>
-<span id="L546" class="LineNr">546 </span><span class="Normal">void</span> check_operands_0f<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="L547" class="LineNr">547 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L528'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L548" class="LineNr">548 </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#L64'>MODRM</a><span class="Delimiter">))</span>
-<span id="L549" class="LineNr">549 </span>    <a href='031check_operands.cc.html#L347'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L550" class="LineNr">550 </span>  <a href='031check_operands.cc.html#L553'>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#L64'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
-<span id="L551" class="LineNr">551 </span><span class="Delimiter">}</span>
+<span id="L540" class="LineNr">540 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L541" class="LineNr">541 </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#L541'>Permitted_operands_0f</a></span><span class="Delimiter">;</span>
+<span id="L542" class="LineNr">542 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
+<span id="L543" class="LineNr">543 </span><span class="SalientComment">//// Class D: just op and disp32</span>
+<span id="L544" class="LineNr">544 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L545" class="LineNr">545 </span><span class="Comment">//  0     0     1      |0       0     0     0</span>
+<span id="L546" class="LineNr">546 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L541'>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="L547" class="LineNr">547 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L541'>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="L548" class="LineNr">548 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L541'>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="L549" class="LineNr">549 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L541'>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="L550" class="LineNr">550 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L541'>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="L551" class="LineNr">551 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L541'>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="L552" class="LineNr">552 </span>
-<span id="L553" class="LineNr">553 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L553'>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="L554" class="LineNr">554 </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#L296'>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="L555" class="LineNr">555 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L287'>computed_expected_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L556" class="LineNr">556 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L557" class="LineNr">557 </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="L558" class="LineNr">558 </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#L71'>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="L559" class="LineNr">559 </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="L560" class="LineNr">560 </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="L561" class="LineNr">561 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L74'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L562" class="LineNr">562 </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="L563" class="LineNr">563 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L571'>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="L564" class="LineNr">564 </span>    <span class="Normal">else</span>
-<span id="L565" class="LineNr">565 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L571'>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="L566" class="LineNr">566 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L567" class="LineNr">567 </span>  <span class="Delimiter">}</span>
-<span id="L568" class="LineNr">568 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L569" class="LineNr">569 </span><span class="Delimiter">}</span>
-<span id="L570" class="LineNr">570 </span>
-<span id="L571" class="LineNr">571 </span>string <a href='031check_operands.cc.html#L571'>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="L572" class="LineNr">572 </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="L573" class="LineNr">573 </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="L574" class="LineNr">574 </span>  <span class="Comment">// strip stuff in parens from the name</span>
-<span id="L575" class="LineNr">575 </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="L576" class="LineNr">576 </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="L577" class="LineNr">577 </span><span class="Delimiter">}</span>
-<span id="L578" class="LineNr">578 </span>
-<span id="L579" class="LineNr">579 </span>string <a href='031check_operands.cc.html#L579'>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="L580" class="LineNr">580 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L581" class="LineNr">581 </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="L582" class="LineNr">582 </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#L579'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
-<span id="L583" class="LineNr">583 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L584" class="LineNr">584 </span><span class="Delimiter">}</span>
-<span id="L585" class="LineNr">585 </span>
-<span id="L586" class="LineNr">586 </span><span class="Comment">#undef HAS</span>
-<span id="L587" class="LineNr">587 </span><span class="Comment">#undef SET</span>
-<span id="L588" class="LineNr">588 </span><span class="Comment">#undef CLEAR</span>
-<span id="L589" class="LineNr">589 </span>
-<span id="L590" class="LineNr">590 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L591" class="LineNr">591 </span><span class="Comment">#include&lt;cctype&gt;</span>
+<span id="L553" class="LineNr">553 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
+<span id="L554" class="LineNr">554 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L555" class="LineNr">555 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
+<span id="L556" class="LineNr">556 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L541'>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="L557" class="LineNr">557 </span>
+<span id="L558" class="LineNr">558 </span><span class="Delimiter">:(code)</span>
+<span id="L559" class="LineNr">559 </span><span class="Normal">void</span> check_operands_0f<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="L560" class="LineNr">560 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L541'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L561" class="LineNr">561 </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#L64'>MODRM</a><span class="Delimiter">))</span>
+<span id="L562" class="LineNr">562 </span>    <a href='031check_operands.cc.html#L354'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L563" class="LineNr">563 </span>  <a href='031check_operands.cc.html#L566'>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#L64'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
+<span id="L564" class="LineNr">564 </span><span class="Delimiter">}</span>
+<span id="L565" class="LineNr">565 </span>
+<span id="L566" class="LineNr">566 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L566'>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="L567" class="LineNr">567 </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#L297'>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="L568" class="LineNr">568 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L287'>compute_expected_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L569" class="LineNr">569 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L570" class="LineNr">570 </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="L571" class="LineNr">571 </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#L71'>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="L572" class="LineNr">572 </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="L573" class="LineNr">573 </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="L574" class="LineNr">574 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L74'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L575" class="LineNr">575 </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="L576" class="LineNr">576 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L584'>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="L577" class="LineNr">577 </span>    <span class="Normal">else</span>
+<span id="L578" class="LineNr">578 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L584'>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="L579" class="LineNr">579 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L580" class="LineNr">580 </span>  <span class="Delimiter">}</span>
+<span id="L581" class="LineNr">581 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L582" class="LineNr">582 </span><span class="Delimiter">}</span>
+<span id="L583" class="LineNr">583 </span>
+<span id="L584" class="LineNr">584 </span>string <a href='031check_operands.cc.html#L584'>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="L585" class="LineNr">585 </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="L586" class="LineNr">586 </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="L587" class="LineNr">587 </span>  <span class="Comment">// strip stuff in parens from the name</span>
+<span id="L588" class="LineNr">588 </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="L589" class="LineNr">589 </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="L590" class="LineNr">590 </span><span class="Delimiter">}</span>
+<span id="L591" class="LineNr">591 </span>
+<span id="L592" class="LineNr">592 </span>string <a href='031check_operands.cc.html#L592'>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="L593" class="LineNr">593 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L594" class="LineNr">594 </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="L595" class="LineNr">595 </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#L592'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
+<span id="L596" class="LineNr">596 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L597" class="LineNr">597 </span><span class="Delimiter">}</span>
+<span id="L598" class="LineNr">598 </span>
+<span id="L599" class="LineNr">599 </span><span class="Comment">#undef HAS</span>
+<span id="L600" class="LineNr">600 </span><span class="Comment">#undef SET</span>
+<span id="L601" class="LineNr">601 </span><span class="Comment">#undef CLEAR</span>
+<span id="L602" class="LineNr">602 </span>
+<span id="L603" class="LineNr">603 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L604" class="LineNr">604 </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 1c28e1d3..6df7342d 100644
--- a/html/subx/032check_operand_bounds.cc.html
+++ b/html/subx/032check_operand_bounds.cc.html
@@ -92,7 +92,7 @@ if ('onhashchange' in window) {
 <span id="L30" class="LineNr">30 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check operand bounds&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L31" class="LineNr">31 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L32" class="LineNr">32 </span>    <span class="Normal">const</span> line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L33" class="LineNr">33 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <a href='031check_operands.cc.html#L300'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
+<span id="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#L301'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
 <span id="L34" class="LineNr">34 </span>      check_operand_bounds<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span>
 <span id="L35" class="LineNr">35 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// stop at the first mal-formed instruction</span>
 <span id="L36" class="LineNr">36 </span>  <span class="Delimiter">}</span>
diff --git a/html/subx/039debug.cc.html b/html/subx/039debug.cc.html
index df6a779a..542fb206 100644
--- a/html/subx/039debug.cc.html
+++ b/html/subx/039debug.cc.html
@@ -63,54 +63,54 @@ if ('onhashchange' in window) {
 <span id="L4" class="LineNr"> 4 </span><span class="Comment">//: (It'll only affect the trace.)</span>
 <span id="L5" class="LineNr"> 5 </span>
 <span id="L6" class="LineNr"> 6 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L7" class="LineNr"> 7 </span>map&lt;<span class="Comment">/*</span><span class="Comment">address</span><span class="Comment">*/</span><span class="Normal">uint32_t</span><span class="Delimiter">,</span> string&gt; <span class="Special">Symbol_name</span><span class="Delimiter">;</span>  <span class="Comment">// used only by 'subx run'</span>
+<span id="L7" class="LineNr"> 7 </span>map&lt;<span class="Comment">/*</span><span class="Comment">address</span><span class="Comment">*/</span><span class="Normal">uint32_t</span><span class="Delimiter">,</span> string&gt; <span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">;</span>  <span class="Comment">// used only by 'subx run'</span>
 <span id="L8" class="LineNr"> 8 </span><span class="Delimiter">:(before &quot;End --map Settings&quot;)</span>
-<span id="L9" class="LineNr"> 9 </span>load_map<span class="Delimiter">(</span><span class="Constant">&quot;map&quot;</span><span class="Delimiter">);</span>
+<span id="L9" class="LineNr"> 9 </span><a href='039debug.cc.html#L11'>load_map</a><span class="Delimiter">(</span><span class="Constant">&quot;map&quot;</span><span class="Delimiter">);</span>
 <span id="L10" class="LineNr">10 </span><span class="Delimiter">:(code)</span>
-<span id="L11" class="LineNr">11 </span><span class="Normal">void</span> load_map<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; map_filename<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L11" class="LineNr">11 </span><span class="Normal">void</span> <a href='039debug.cc.html#L11'>load_map</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; map_filename<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L12" class="LineNr">12 </span>  ifstream fin<span class="Delimiter">(</span>map_filename<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
 <span id="L13" class="LineNr">13 </span>  fin &gt;&gt; std::hex<span class="Delimiter">;</span>
-<span id="L14" class="LineNr">14 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>has_data<span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L14" class="LineNr">14 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L15" class="LineNr">15 </span>    <span class="Normal">uint32_t</span> addr = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L16" class="LineNr">16 </span>    fin &gt;&gt; addr<span class="Delimiter">;</span>
 <span id="L17" class="LineNr">17 </span>    string name<span class="Delimiter">;</span>
 <span id="L18" class="LineNr">18 </span>    fin &gt;&gt; name<span class="Delimiter">;</span>
-<span id="L19" class="LineNr">19 </span>    put<span class="Delimiter">(</span><span class="Special">Symbol_name</span><span class="Delimiter">,</span> addr<span class="Delimiter">,</span> name<span class="Delimiter">);</span>
+<span id="L19" class="LineNr">19 </span>    <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> addr<span class="Delimiter">,</span> name<span class="Delimiter">);</span>
 <span id="L20" class="LineNr">20 </span>  <span class="Delimiter">}</span>
 <span id="L21" class="LineNr">21 </span><span class="Delimiter">}</span>
 <span id="L22" class="LineNr">22 </span>
 <span id="L23" class="LineNr">23 </span><span class="Delimiter">:(after &quot;Run One Instruction&quot;)</span>
-<span id="L24" class="LineNr">24 </span><span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span><span class="Special">Symbol_name</span><span class="Delimiter">,</span> EIP<span class="Delimiter">))</span>
-<span id="L25" class="LineNr">25 </span>  trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;== label &quot;</span> &lt;&lt; get<span class="Delimiter">(</span><span class="Special">Symbol_name</span><span class="Delimiter">,</span> EIP<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L24" class="LineNr">24 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">))</span>
+<span id="L25" class="LineNr">25 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;== label &quot;</span> &lt;&lt; get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L26" class="LineNr">26 </span>
 <span id="L27" class="LineNr">27 </span><span class="Comment">//: If a label starts with '$watch-', make a note of the effective address</span>
 <span id="L28" class="LineNr">28 </span><span class="Comment">//: computed by the next instruction. Start dumping out its contents to the</span>
 <span id="L29" class="LineNr">29 </span><span class="Comment">//: trace after every subsequent instruction.</span>
 <span id="L30" class="LineNr">30 </span>
 <span id="L31" class="LineNr">31 </span><span class="Delimiter">:(after &quot;Run One Instruction&quot;)</span>
-<span id="L32" class="LineNr">32 </span>dump_watch_points<span class="Delimiter">();</span>
+<span id="L32" class="LineNr">32 </span><a href='039debug.cc.html#L38'>dump_watch_points</a><span class="Delimiter">();</span>
 <span id="L33" class="LineNr">33 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L34" class="LineNr">34 </span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt; <span class="Special">Watch_points</span><span class="Delimiter">;</span>
+<span id="L34" class="LineNr">34 </span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt; <span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">;</span>
 <span id="L35" class="LineNr">35 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L36" class="LineNr">36 </span><span class="Special">Watch_points</span><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
+<span id="L36" class="LineNr">36 </span><span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
 <span id="L37" class="LineNr">37 </span><span class="Delimiter">:(code)</span>
-<span id="L38" class="LineNr">38 </span><span class="Normal">void</span> dump_watch_points<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L39" class="LineNr">39 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special">Watch_points</span><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L40" class="LineNr">40 </span>  dbg &lt;&lt; <span class="Constant">&quot;watch points:&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L41" class="LineNr">41 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;::iterator p = <span class="Special">Watch_points</span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special">Watch_points</span><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L42" class="LineNr">42 </span>    dbg &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; HEXWORD &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; HEXWORD &lt;&lt; read_mem_u32<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L38" class="LineNr">38 </span><span class="Normal">void</span> <a href='039debug.cc.html#L38'>dump_watch_points</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L39" class="LineNr">39 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L40" class="LineNr">40 </span>  <a href='003trace.cc.html#L186'>dbg</a> &lt;&lt; <span class="Constant">&quot;watch points:&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L41" class="LineNr">41 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;::iterator p = <span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L42" class="LineNr">42 </span>    <a href='003trace.cc.html#L186'>dbg</a> &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="Constant">&quot; -&gt; &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>p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L43" class="LineNr">43 </span><span class="Delimiter">}</span>
 <span id="L44" class="LineNr">44 </span>
 <span id="L45" class="LineNr">45 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
 <span id="L46" class="LineNr">46 </span>string <span class="Special">Watch_this_effective_address</span><span class="Delimiter">;</span>
 <span id="L47" class="LineNr">47 </span><span class="Delimiter">:(after &quot;Run One Instruction&quot;)</span>
 <span id="L48" class="LineNr">48 </span><span class="Special">Watch_this_effective_address</span> = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L49" class="LineNr">49 </span><span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span><span class="Special">Symbol_name</span><span class="Delimiter">,</span> EIP<span class="Delimiter">)</span> &amp;&amp; starts_with<span class="Delimiter">(</span>get<span class="Delimiter">(</span><span class="Special">Symbol_name</span><span class="Delimiter">,</span> EIP<span class="Delimiter">),</span> <span class="Constant">&quot;$watch-&quot;</span><span class="Delimiter">))</span>
-<span id="L50" class="LineNr">50 </span>  <span class="Special">Watch_this_effective_address</span> = get<span class="Delimiter">(</span><span class="Special">Symbol_name</span><span class="Delimiter">,</span> EIP<span class="Delimiter">);</span>
+<span id="L49" class="LineNr">49 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">)</span> &amp;&amp; <a href='001help.cc.html#L102'>starts_with</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">),</span> <span class="Constant">&quot;$watch-&quot;</span><span class="Delimiter">))</span>
+<span id="L50" class="LineNr">50 </span>  <span class="Special">Watch_this_effective_address</span> = get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
 <span id="L51" class="LineNr">51 </span><span class="Delimiter">:(after &quot;Found effective_address(addr)&quot;)</span>
 <span id="L52" class="LineNr">52 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special">Watch_this_effective_address</span><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L53" class="LineNr">53 </span>  dbg &lt;&lt; <span class="Constant">&quot;now watching &quot;</span> &lt;&lt; HEXWORD &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; for &quot;</span> &lt;&lt; <span class="Special">Watch_this_effective_address</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L54" class="LineNr">54 </span>  put<span class="Delimiter">(</span><span class="Special">Watch_points</span><span class="Delimiter">,</span> <span class="Special">Watch_this_effective_address</span><span class="Delimiter">,</span> addr<span class="Delimiter">);</span>
+<span id="L53" class="LineNr">53 </span>  <a href='003trace.cc.html#L186'>dbg</a> &lt;&lt; <span class="Constant">&quot;now watching &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; for &quot;</span> &lt;&lt; <span class="Special">Watch_this_effective_address</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L54" class="LineNr">54 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">,</span> <span class="Special">Watch_this_effective_address</span><span class="Delimiter">,</span> addr<span class="Delimiter">);</span>
 <span id="L55" class="LineNr">55 </span><span class="Delimiter">}</span>
 </pre>
 </body>