about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--html/subx/010core.cc.html462
-rw-r--r--html/subx/011direct_addressing.cc.html92
-rw-r--r--html/subx/012indirect_addressing.cc.html90
-rw-r--r--html/subx/013immediate_addressing.cc.html132
-rw-r--r--html/subx/014jump_relative.cc.html68
-rw-r--r--html/subx/015jump_relative.cc.html56
-rw-r--r--subx/010core.cc4
7 files changed, 454 insertions, 450 deletions
diff --git a/html/subx/010core.cc.html b/html/subx/010core.cc.html
index 2fe9f502..1efe4533 100644
--- a/html/subx/010core.cc.html
+++ b/html/subx/010core.cc.html
@@ -16,16 +16,16 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .Constant { color: #00a0a0; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Conceal { color: #4e4e4e; }
-.cSpecial { color: #008000; }
 .SalientComment { color: #00ffff; }
 .Delimiter { color: #800080; }
 .LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.PreProc { color: #800080; }
+.cSpecial { color: #008000; }
 .traceContains { color: #008000; }
 -->
 </style>
@@ -61,237 +61,239 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="SalientComment">//:: simulated x86 registers</span>
-<span id="L2" class="LineNr">  2 </span>
-<span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L4" class="LineNr">  4 </span><span class="Normal">enum</span> <span class="Delimiter">{</span>
-<span id="L5" class="LineNr">  5 </span>  <a href='010core.cc.html#L5'>EAX</a><span class="Delimiter">,</span>
-<span id="L6" class="LineNr">  6 </span>  <a href='010core.cc.html#L6'>ECX</a><span class="Delimiter">,</span>
-<span id="L7" class="LineNr">  7 </span>  <a href='010core.cc.html#L7'>EDX</a><span class="Delimiter">,</span>
-<span id="L8" class="LineNr">  8 </span>  <a href='010core.cc.html#L8'>EBX</a><span class="Delimiter">,</span>
-<span id="L9" class="LineNr">  9 </span>  <a href='010core.cc.html#L9'>ESP</a><span class="Delimiter">,</span>
-<span id="L10" class="LineNr"> 10 </span>  <a href='010core.cc.html#L10'>EBP</a><span class="Delimiter">,</span>
-<span id="L11" class="LineNr"> 11 </span>  <a href='010core.cc.html#L11'>ESI</a><span class="Delimiter">,</span>
-<span id="L12" class="LineNr"> 12 </span>  <a href='010core.cc.html#L12'>EDI</a><span class="Delimiter">,</span>
-<span id="L13" class="LineNr"> 13 </span>  <a href='010core.cc.html#L13'>NUM_INT_REGISTERS</a><span class="Delimiter">,</span>
-<span id="L14" class="LineNr"> 14 </span><span class="Delimiter">};</span>
-<span id="L15" class="LineNr"> 15 </span><span class="Normal">union</span> <a href='010core.cc.html#L15'>reg</a> <span class="Delimiter">{</span>
-<span id="L16" class="LineNr"> 16 </span>  <span class="Normal">int32_t</span> i<span class="Delimiter">;</span>
-<span id="L17" class="LineNr"> 17 </span>  <span class="Normal">uint32_t</span> u<span class="Delimiter">;</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Delimiter">};</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L20" class="LineNr"> 20 </span><a href='010core.cc.html#L15'>reg</a> Reg[NUM_INT_REGISTERS] = <span class="Delimiter">{</span> <span class="Delimiter">{</span><span class="Constant">0</span><span class="Delimiter">}</span> <span class="Delimiter">};</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Normal">uint32_t</span> <a href='010core.cc.html#L21'>EIP</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L23" class="LineNr"> 23 </span>bzero<span class="Delimiter">(</span><a href='010core.cc.html#L20'>Reg</a><span class="Delimiter">,</span> <span class="Normal">sizeof</span><span class="Delimiter">(</span><a href='010core.cc.html#L20'>Reg</a><span class="Delimiter">));</span>
-<span id="L24" class="LineNr"> 24 </span><a href='010core.cc.html#L21'>EIP</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L25" class="LineNr"> 25 </span>
-<span id="L26" class="LineNr"> 26 </span><span class="SalientComment">//:: simulated flag registers; just a subset that we care about</span>
+<span id="L1" class="LineNr">  1 </span><span class="SalientComment">//:: simulated x86 registers; just a subset</span>
+<span id="L2" class="LineNr">  2 </span><span class="Comment">//:    assume segment registers are hard-coded to 0</span>
+<span id="L3" class="LineNr">  3 </span><span class="Comment">//:    no floating-point, MMX, etc. yet</span>
+<span id="L4" class="LineNr">  4 </span>
+<span id="L5" class="LineNr">  5 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L6" class="LineNr">  6 </span><span class="Normal">enum</span> <span class="Delimiter">{</span>
+<span id="L7" class="LineNr">  7 </span>  <a href='010core.cc.html#L7'>EAX</a><span class="Delimiter">,</span>
+<span id="L8" class="LineNr">  8 </span>  <a href='010core.cc.html#L8'>ECX</a><span class="Delimiter">,</span>
+<span id="L9" class="LineNr">  9 </span>  <a href='010core.cc.html#L9'>EDX</a><span class="Delimiter">,</span>
+<span id="L10" class="LineNr"> 10 </span>  <a href='010core.cc.html#L10'>EBX</a><span class="Delimiter">,</span>
+<span id="L11" class="LineNr"> 11 </span>  <a href='010core.cc.html#L11'>ESP</a><span class="Delimiter">,</span>
+<span id="L12" class="LineNr"> 12 </span>  <a href='010core.cc.html#L12'>EBP</a><span class="Delimiter">,</span>
+<span id="L13" class="LineNr"> 13 </span>  <a href='010core.cc.html#L13'>ESI</a><span class="Delimiter">,</span>
+<span id="L14" class="LineNr"> 14 </span>  <a href='010core.cc.html#L14'>EDI</a><span class="Delimiter">,</span>
+<span id="L15" class="LineNr"> 15 </span>  <a href='010core.cc.html#L15'>NUM_INT_REGISTERS</a><span class="Delimiter">,</span>
+<span id="L16" class="LineNr"> 16 </span><span class="Delimiter">};</span>
+<span id="L17" class="LineNr"> 17 </span><span class="Normal">union</span> <a href='010core.cc.html#L17'>reg</a> <span class="Delimiter">{</span>
+<span id="L18" class="LineNr"> 18 </span>  <span class="Normal">int32_t</span> i<span class="Delimiter">;</span>
+<span id="L19" class="LineNr"> 19 </span>  <span class="Normal">uint32_t</span> u<span class="Delimiter">;</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Delimiter">};</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L22" class="LineNr"> 22 </span><a href='010core.cc.html#L17'>reg</a> Reg[NUM_INT_REGISTERS] = <span class="Delimiter">{</span> <span class="Delimiter">{</span><span class="Constant">0</span><span class="Delimiter">}</span> <span class="Delimiter">};</span>
+<span id="L23" class="LineNr"> 23 </span><span class="Normal">uint32_t</span> <a href='010core.cc.html#L23'>EIP</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L24" class="LineNr"> 24 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L25" class="LineNr"> 25 </span>bzero<span class="Delimiter">(</span><a href='010core.cc.html#L22'>Reg</a><span class="Delimiter">,</span> <span class="Normal">sizeof</span><span class="Delimiter">(</span><a href='010core.cc.html#L22'>Reg</a><span class="Delimiter">));</span>
+<span id="L26" class="LineNr"> 26 </span><a href='010core.cc.html#L23'>EIP</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L27" class="LineNr"> 27 </span>
-<span id="L28" class="LineNr"> 28 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L29" class="LineNr"> 29 </span><span class="Normal">bool</span> SF = <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// sign flag</span>
-<span id="L30" class="LineNr"> 30 </span><span class="Normal">bool</span> ZF = <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// zero flag</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Normal">bool</span> <a href='010core.cc.html#L31'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// overflow flag</span>
-<span id="L32" class="LineNr"> 32 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L33" class="LineNr"> 33 </span>SF = ZF = <a href='010core.cc.html#L31'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
-<span id="L34" class="LineNr"> 34 </span>
-<span id="L35" class="LineNr"> 35 </span><span class="Comment">//: how the flag registers are updated after each instruction</span>
+<span id="L28" class="LineNr"> 28 </span><span class="SalientComment">//:: simulated flag registers; just a subset that we care about</span>
+<span id="L29" class="LineNr"> 29 </span>
+<span id="L30" class="LineNr"> 30 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L31" class="LineNr"> 31 </span><span class="Normal">bool</span> SF = <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// sign flag</span>
+<span id="L32" class="LineNr"> 32 </span><span class="Normal">bool</span> ZF = <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// zero flag</span>
+<span id="L33" class="LineNr"> 33 </span><span class="Normal">bool</span> <a href='010core.cc.html#L33'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>  <span class="Comment">// overflow flag</span>
+<span id="L34" class="LineNr"> 34 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L35" class="LineNr"> 35 </span>SF = ZF = <a href='010core.cc.html#L33'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L36" class="LineNr"> 36 </span>
-<span id="L37" class="LineNr"> 37 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L38" class="LineNr"> 38 </span><span class="Comment">// Combine 'arg1' and 'arg2' with arithmetic operation 'op' and store the</span>
-<span id="L39" class="LineNr"> 39 </span><span class="Comment">// result in 'arg1', then update flags.</span>
-<span id="L40" class="LineNr"> 40 </span><span class="Comment">// beware: no side-effects in args</span>
-<span id="L41" class="LineNr"> 41 </span><span class="PreProc">#define BINARY_ARITHMETIC_OP(op</span><span class="Delimiter">,</span><span class="PreProc"> arg1</span><span class="Delimiter">,</span><span class="PreProc"> arg2) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
-<span id="L42" class="LineNr"> 42 </span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be signed </span><span class="Comment">*/</span><span class="PreProc"> \</span>
-<span id="L43" class="LineNr"> 43 </span><span class="PreProc">  </span><span class="Normal">int64_t</span><span class="PreProc"> tmp = arg1 op arg2</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L44" class="LineNr"> 44 </span><span class="PreProc">  arg1 = arg1 op arg2</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L45" class="LineNr"> 45 </span><span class="PreProc">  trace(</span><span class="Constant">2</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;run&quot;</span><span class="PreProc">) &lt;&lt; </span><span class="Constant">&quot;storing 0x&quot;</span><span class="PreProc"> &lt;&lt; <a href='010core.cc.html#L228'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end()</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L46" class="LineNr"> 46 </span><span class="PreProc">  SF = (arg1 &lt; </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L47" class="LineNr"> 47 </span><span class="PreProc">  ZF = (arg1 == </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L48" class="LineNr"> 48 </span><span class="PreProc">  <a href='010core.cc.html#L31'>OF</a> = (arg1 != tmp)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L49" class="LineNr"> 49 </span><span class="Delimiter">}</span>
-<span id="L50" class="LineNr"> 50 </span>
-<span id="L51" class="LineNr"> 51 </span><span class="Comment">// Combine 'arg1' and 'arg2' with bitwise operation 'op' and store the result</span>
-<span id="L52" class="LineNr"> 52 </span><span class="Comment">// in 'arg1', then update flags.</span>
-<span id="L53" class="LineNr"> 53 </span><span class="PreProc">#define BINARY_BITWISE_OP(op</span><span class="Delimiter">,</span><span class="PreProc"> arg1</span><span class="Delimiter">,</span><span class="PreProc"> arg2) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
-<span id="L54" class="LineNr"> 54 </span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be unsigned </span><span class="Comment">*/</span><span class="PreProc"> \</span>
-<span id="L55" class="LineNr"> 55 </span><span class="PreProc">  arg1 = arg1 op arg2</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L56" class="LineNr"> 56 </span><span class="PreProc">  trace(</span><span class="Constant">2</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;run&quot;</span><span class="PreProc">) &lt;&lt; </span><span class="Constant">&quot;storing 0x&quot;</span><span class="PreProc"> &lt;&lt; <a href='010core.cc.html#L228'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end()</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L57" class="LineNr"> 57 </span><span class="PreProc">  SF = (arg1 &gt;&gt; </span><span class="Constant">31</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L58" class="LineNr"> 58 </span><span class="PreProc">  ZF = (arg1 == </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L59" class="LineNr"> 59 </span><span class="PreProc">  <a href='010core.cc.html#L31'>OF</a> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L60" class="LineNr"> 60 </span><span class="Delimiter">}</span>
-<span id="L61" class="LineNr"> 61 </span>
-<span id="L62" class="LineNr"> 62 </span><span class="SalientComment">//:: simulated RAM</span>
+<span id="L37" class="LineNr"> 37 </span><span class="Comment">//: how the flag registers are updated after each instruction</span>
+<span id="L38" class="LineNr"> 38 </span>
+<span id="L39" class="LineNr"> 39 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L40" class="LineNr"> 40 </span><span class="Comment">// Combine 'arg1' and 'arg2' with arithmetic operation 'op' and store the</span>
+<span id="L41" class="LineNr"> 41 </span><span class="Comment">// result in 'arg1', then update flags.</span>
+<span id="L42" class="LineNr"> 42 </span><span class="Comment">// beware: no side-effects in args</span>
+<span id="L43" class="LineNr"> 43 </span><span class="PreProc">#define BINARY_ARITHMETIC_OP(op</span><span class="Delimiter">,</span><span class="PreProc"> arg1</span><span class="Delimiter">,</span><span class="PreProc"> arg2) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
+<span id="L44" class="LineNr"> 44 </span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be signed </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L45" class="LineNr"> 45 </span><span class="PreProc">  </span><span class="Normal">int64_t</span><span class="PreProc"> tmp = arg1 op arg2</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L46" class="LineNr"> 46 </span><span class="PreProc">  arg1 = arg1 op arg2</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L47" class="LineNr"> 47 </span><span class="PreProc">  trace(</span><span class="Constant">2</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;run&quot;</span><span class="PreProc">) &lt;&lt; </span><span class="Constant">&quot;storing 0x&quot;</span><span class="PreProc"> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end()</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L48" class="LineNr"> 48 </span><span class="PreProc">  SF = (arg1 &lt; </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L49" class="LineNr"> 49 </span><span class="PreProc">  ZF = (arg1 == </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L50" class="LineNr"> 50 </span><span class="PreProc">  <a href='010core.cc.html#L33'>OF</a> = (arg1 != tmp)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L51" class="LineNr"> 51 </span><span class="Delimiter">}</span>
+<span id="L52" class="LineNr"> 52 </span>
+<span id="L53" class="LineNr"> 53 </span><span class="Comment">// Combine 'arg1' and 'arg2' with bitwise operation 'op' and store the result</span>
+<span id="L54" class="LineNr"> 54 </span><span class="Comment">// in 'arg1', then update flags.</span>
+<span id="L55" class="LineNr"> 55 </span><span class="PreProc">#define BINARY_BITWISE_OP(op</span><span class="Delimiter">,</span><span class="PreProc"> arg1</span><span class="Delimiter">,</span><span class="PreProc"> arg2) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
+<span id="L56" class="LineNr"> 56 </span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be unsigned </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L57" class="LineNr"> 57 </span><span class="PreProc">  arg1 = arg1 op arg2</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L58" class="LineNr"> 58 </span><span class="PreProc">  trace(</span><span class="Constant">2</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;run&quot;</span><span class="PreProc">) &lt;&lt; </span><span class="Constant">&quot;storing 0x&quot;</span><span class="PreProc"> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end()</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L59" class="LineNr"> 59 </span><span class="PreProc">  SF = (arg1 &gt;&gt; </span><span class="Constant">31</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L60" class="LineNr"> 60 </span><span class="PreProc">  ZF = (arg1 == </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L61" class="LineNr"> 61 </span><span class="PreProc">  <a href='010core.cc.html#L33'>OF</a> = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L62" class="LineNr"> 62 </span><span class="Delimiter">}</span>
 <span id="L63" class="LineNr"> 63 </span>
-<span id="L64" class="LineNr"> 64 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L65" class="LineNr"> 65 </span>vector&lt;<span class="Normal">uint8_t</span>&gt; <a href='010core.cc.html#L65'>Mem</a><span class="Delimiter">;</span>
-<span id="L66" class="LineNr"> 66 </span><span class="Normal">uint32_t</span> <a href='010core.cc.html#L66'>End_of_program</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L67" class="LineNr"> 67 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L68" class="LineNr"> 68 </span><a href='010core.cc.html#L65'>Mem</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
-<span id="L69" class="LineNr"> 69 </span><a href='010core.cc.html#L65'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1024</span><span class="Delimiter">);</span>
-<span id="L70" class="LineNr"> 70 </span><a href='010core.cc.html#L66'>End_of_program</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L71" class="LineNr"> 71 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L72" class="LineNr"> 72 </span><span class="Comment">// depends on Mem being laid out contiguously (so you can't use a map, etc.)</span>
-<span id="L73" class="LineNr"> 73 </span><span class="Comment">// and on the host also being little-endian</span>
-<span id="L74" class="LineNr"> 74 </span><span class="PreProc">#define SET_WORD_IN_MEM(addr</span><span class="Delimiter">,</span><span class="PreProc"> val)  *</span><span class="Normal">reinterpret_cast</span><span class="PreProc">&lt;</span><span class="Normal">int32_t</span><span class="PreProc">*&gt;(&amp;Mem</span><span class="Delimiter">.</span><span class="PreProc">at(addr)) = val</span><span class="Delimiter">;</span>
-<span id="L75" class="LineNr"> 75 </span>
-<span id="L76" class="LineNr"> 76 </span><span class="SalientComment">//:: core interpreter loop</span>
+<span id="L64" class="LineNr"> 64 </span><span class="SalientComment">//:: simulated RAM</span>
+<span id="L65" class="LineNr"> 65 </span>
+<span id="L66" class="LineNr"> 66 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L67" class="LineNr"> 67 </span>vector&lt;<span class="Normal">uint8_t</span>&gt; <a href='010core.cc.html#L67'>Mem</a><span class="Delimiter">;</span>
+<span id="L68" class="LineNr"> 68 </span><span class="Normal">uint32_t</span> <a href='010core.cc.html#L68'>End_of_program</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L69" class="LineNr"> 69 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L70" class="LineNr"> 70 </span><a href='010core.cc.html#L67'>Mem</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
+<span id="L71" class="LineNr"> 71 </span><a href='010core.cc.html#L67'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1024</span><span class="Delimiter">);</span>
+<span id="L72" class="LineNr"> 72 </span><a href='010core.cc.html#L68'>End_of_program</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L74" class="LineNr"> 74 </span><span class="Comment">// depends on Mem being laid out contiguously (so you can't use a map, etc.)</span>
+<span id="L75" class="LineNr"> 75 </span><span class="Comment">// and on the host also being little-endian</span>
+<span id="L76" class="LineNr"> 76 </span><span class="PreProc">#define SET_WORD_IN_MEM(addr</span><span class="Delimiter">,</span><span class="PreProc"> val)  *</span><span class="Normal">reinterpret_cast</span><span class="PreProc">&lt;</span><span class="Normal">int32_t</span><span class="PreProc">*&gt;(&amp;Mem</span><span class="Delimiter">.</span><span class="PreProc">at(addr)) = val</span><span class="Delimiter">;</span>
 <span id="L77" class="LineNr"> 77 </span>
-<span id="L78" class="LineNr"> 78 </span><span class="Delimiter">:(scenario add_imm32_to_eax)</span>
-<span id="L79" class="LineNr"> 79 </span><span class="Comment"># In scenarios, programs are a series of hex bytes, each (variable-length)</span>
-<span id="L80" class="LineNr"> 80 </span><span class="Comment"># instruction on one line.</span>
-<span id="L81" class="LineNr"> 81 </span>#
-<span id="L82" class="LineNr"> 82 </span><span class="Comment"># x86 instructions consist of the following parts (see cheatsheet.pdf):</span>
-<span id="L83" class="LineNr"> 83 </span><span class="Comment">#   opcode        ModR/M                    SIB                   displacement    immediate</span>
-<span id="L84" class="LineNr"> 84 </span><span class="Comment">#   instruction   mod, reg, Reg/Mem bits    scale, index, base</span>
-<span id="L85" class="LineNr"> 85 </span><span class="Comment">#   1-3 bytes     0/1 byte                  0/1 byte              0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L86" class="LineNr"> 86 </span>  <span class="Conceal">¦</span> <span class="PreProc">0</span><span class="Constant">5</span>                                                                            0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to EAX</span>
-<span id="L87" class="LineNr"> 87 </span><span class="Comment"># All hex bytes must be exactly 2 characters each. No '0x' prefixes.</span>
-<span id="L88" class="LineNr"> 88 </span><span class="traceContains">+load: 1 -&gt; 05</span>
-<span id="L89" class="LineNr"> 89 </span><span class="traceContains">+load: 2 -&gt; 0a</span>
-<span id="L90" class="LineNr"> 90 </span><span class="traceContains">+load: 3 -&gt; 0b</span>
-<span id="L91" class="LineNr"> 91 </span><span class="traceContains">+load: 4 -&gt; 0c</span>
-<span id="L92" class="LineNr"> 92 </span><span class="traceContains">+load: 5 -&gt; 0d</span>
-<span id="L93" class="LineNr"> 93 </span><span class="traceContains">+run: add <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a to <a href='010core.cc.html#L15'>reg</a> <a href='010core.cc.html#L5'>EAX</a></span>
-<span id="L94" class="LineNr"> 94 </span><span class="traceContains">+run: storing 0x0d0c0b0a</span>
-<span id="L95" class="LineNr"> 95 </span>
-<span id="L96" class="LineNr"> 96 </span><span class="Delimiter">:(code)</span>
-<span id="L97" class="LineNr"> 97 </span><span class="Comment">// helper for tests: load a program into memory from a textual representation</span>
-<span id="L98" class="LineNr"> 98 </span><span class="Comment">// of its bytes, and run it</span>
-<span id="L99" class="LineNr"> 99 </span><span class="Normal">void</span> <a href='010core.cc.html#L99'>run</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L100" class="LineNr">100 </span>  <a href='010core.cc.html#L152'>load_program</a><span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
-<span id="L101" class="LineNr">101 </span>  <a href='010core.cc.html#L21'>EIP</a> = <span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// preserve null pointer</span>
-<span id="L102" class="LineNr">102 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010core.cc.html#L21'>EIP</a> &lt; <a href='010core.cc.html#L66'>End_of_program</a><span class="Delimiter">)</span>
-<span id="L103" class="LineNr">103 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L107'>run_one_instruction</a><span class="Delimiter">();</span>
-<span id="L104" class="LineNr">104 </span><span class="Delimiter">}</span>
-<span id="L105" class="LineNr">105 </span>
-<span id="L106" class="LineNr">106 </span><span class="Comment">// skeleton of how x86 instructions are decoded</span>
-<span id="L107" class="LineNr">107 </span><span class="Normal">void</span> <a href='010core.cc.html#L107'>run_one_instruction</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Normal">uint8_t</span> op=<span class="Constant">0</span><span class="Delimiter">,</span> op2=<span class="Constant">0</span><span class="Delimiter">,</span> op3=<span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L109" class="LineNr">109 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;inst: 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L228'>HEXWORD</a> &lt;&lt; <a href='010core.cc.html#L21'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L110" class="LineNr">110 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>op = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L111" class="LineNr">111 </span>  <span class="Normal">case</span> <span class="Constant">0xf4</span>:  <span class="Comment">// hlt</span>
-<span id="L112" class="LineNr">112 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L21'>EIP</a> = <a href='010core.cc.html#L66'>End_of_program</a><span class="Delimiter">;</span>
-<span id="L113" class="LineNr">113 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Comment">// our first opcode</span>
-<span id="L115" class="LineNr">115 </span>  <span class="Normal">case</span> <span class="Constant">0x05</span>: <span class="Delimiter">{</span>  <span class="Comment">// add imm32 to EAX</span>
-<span id="L116" class="LineNr">116 </span>  <span class="Conceal">¦</span> <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L217'>imm32</a><span class="Delimiter">();</span>
-<span id="L117" class="LineNr">117 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add <a href='010core.cc.html#L217'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to <a href='010core.cc.html#L15'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L118" class="LineNr">118 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L41'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L119" class="LineNr">119 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L120" class="LineNr">120 </span>  <span class="Delimiter">}</span>
-<span id="L121" class="LineNr">121 </span>  <span class="Comment">// End Single-Byte Opcodes</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Normal">case</span> <span class="Constant">0x0f</span>:
-<span id="L123" class="LineNr">123 </span>  <span class="Conceal">¦</span> <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L124" class="LineNr">124 </span>  <span class="Conceal">¦</span> <span class="Comment">// End Two-Byte Opcodes Starting With 0f</span>
-<span id="L125" class="LineNr">125 </span>  <span class="Conceal">¦</span> <span class="Normal">default</span>:
-<span id="L126" class="LineNr">126 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after 0f: &quot;</span> &lt;&lt; <a href='010core.cc.html#L227'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L127" class="LineNr">127 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L128" class="LineNr">128 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L129" class="LineNr">129 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L130" class="LineNr">130 </span>  <span class="Normal">case</span> <span class="Constant">0xf3</span>:
-<span id="L131" class="LineNr">131 </span>  <span class="Conceal">¦</span> <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L132" class="LineNr">132 </span>  <span class="Conceal">¦</span> <span class="Comment">// End Two-Byte Opcodes Starting With f3</span>
-<span id="L133" class="LineNr">133 </span>  <span class="Conceal">¦</span> <span class="Normal">case</span> <span class="Constant">0x0f</span>:
-<span id="L134" class="LineNr">134 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L135" class="LineNr">135 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// End Three-Byte Opcodes Starting With f3 0f</span>
-<span id="L136" class="LineNr">136 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">default</span>:
-<span id="L137" class="LineNr">137 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f3 0f: &quot;</span> &lt;&lt; <a href='010core.cc.html#L227'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L138" class="LineNr">138 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L139" class="LineNr">139 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L140" class="LineNr">140 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Conceal">¦</span> <span class="Normal">default</span>:
-<span id="L142" class="LineNr">142 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f3: &quot;</span> &lt;&lt; <a href='010core.cc.html#L227'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L143" class="LineNr">143 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L144" class="LineNr">144 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L145" class="LineNr">145 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L146" class="LineNr">146 </span>  <span class="Normal">default</span>:
-<span id="L147" class="LineNr">147 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized opcode: &quot;</span> &lt;&lt; <a href='010core.cc.html#L227'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Delimiter">}</span>
-<span id="L150" class="LineNr">150 </span><span class="Delimiter">}</span>
-<span id="L151" class="LineNr">151 </span>
-<span id="L152" class="LineNr">152 </span><span class="Normal">void</span> <a href='010core.cc.html#L152'>load_program</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L153" class="LineNr">153 </span>  <span class="Normal">uint32_t</span> addr = <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L154" class="LineNr">154 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
-<span id="L155" class="LineNr">155 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
-<span id="L156" class="LineNr">156 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L188'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Conceal">¦</span> <span class="Normal">char</span> c1 = <a href='010core.cc.html#L175'>next_hex_byte</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c1 == <span class="cSpecial">'\0'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L159" class="LineNr">159 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L160" class="LineNr">160 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L167'>raise</a> &lt;&lt; <span class="Constant">&quot;input program truncated mid-byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L161" class="LineNr">161 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L162" class="LineNr">162 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L163" class="LineNr">163 </span>  <span class="Conceal">¦</span> <span class="Normal">char</span> c2 = <a href='010core.cc.html#L175'>next_hex_byte</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L164" class="LineNr">164 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c2 == <span class="cSpecial">'\0'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L165" class="LineNr">165 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L167'>raise</a> &lt;&lt; <span class="Constant">&quot;input program truncated mid-byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L166" class="LineNr">166 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L167" class="LineNr">167 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L168" class="LineNr">168 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L65'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>addr<span class="Delimiter">)</span> = <a href='010core.cc.html#L202'>to_byte</a><span class="Delimiter">(</span>c1<span class="Delimiter">,</span> c2<span class="Delimiter">);</span>
-<span id="L169" class="LineNr">169 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010core.cc.html#L227'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span><a href='010core.cc.html#L65'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>addr<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L170" class="LineNr">170 </span>  <span class="Conceal">¦</span> addr++<span class="Delimiter">;</span>
-<span id="L171" class="LineNr">171 </span>  <span class="Delimiter">}</span>
-<span id="L172" class="LineNr">172 </span>  <a href='010core.cc.html#L66'>End_of_program</a> = addr<span class="Delimiter">;</span>
-<span id="L173" class="LineNr">173 </span><span class="Delimiter">}</span>
-<span id="L174" class="LineNr">174 </span>
-<span id="L175" class="LineNr">175 </span><span class="Normal">char</span> <a href='010core.cc.html#L175'>next_hex_byte</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L176" class="LineNr">176 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L188'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L177" class="LineNr">177 </span>  <span class="Conceal">¦</span> <span class="Normal">char</span> c = <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
-<span id="L178" class="LineNr">178 </span>  <span class="Conceal">¦</span> in &gt;&gt; c<span class="Delimiter">;</span>
-<span id="L179" class="LineNr">179 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">' '</span> || c == <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L180" class="LineNr">180 </span>  <span class="Conceal">¦</span> <span class="Normal">while</span> <span class="Delimiter">(</span>c == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L181" class="LineNr">181 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L188'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L182" class="LineNr">182 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> in &gt;&gt; c<span class="Delimiter">;</span>
-<span id="L183" class="LineNr">183 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L184" class="LineNr">184 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> in &gt;&gt; c<span class="Delimiter">;</span>
-<span id="L185" class="LineNr">185 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L186" class="LineNr">186 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L187" class="LineNr">187 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L188" class="LineNr">188 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L189" class="LineNr">189 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="cSpecial">'\0'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c<span class="Delimiter">;</span>
-<span id="L190" class="LineNr">190 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'0'</span> &amp;&amp; c &lt;= <span class="Constant">'9'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c<span class="Delimiter">;</span>
-<span id="L191" class="LineNr">191 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'a'</span> &amp;&amp; c &lt;= <span class="Constant">'f'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c<span class="Delimiter">;</span>
-<span id="L192" class="LineNr">192 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'A'</span> &amp;&amp; c &lt;= <span class="Constant">'F'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> tolower<span class="Delimiter">(</span>c<span class="Delimiter">);</span>
-<span id="L193" class="LineNr">193 </span>  <span class="Conceal">¦</span> <span class="Comment">// disallow any non-hex characters, including a '0x' prefix</span>
-<span id="L194" class="LineNr">194 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>c<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L195" class="LineNr">195 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L167'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid non-hex character &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>c<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L196" class="LineNr">196 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L197" class="LineNr">197 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L198" class="LineNr">198 </span>  <span class="Delimiter">}</span>
-<span id="L199" class="LineNr">199 </span>  <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
-<span id="L200" class="LineNr">200 </span><span class="Delimiter">}</span>
-<span id="L201" class="LineNr">201 </span>
-<span id="L202" class="LineNr">202 </span><span class="Normal">uint8_t</span> <a href='010core.cc.html#L202'>to_byte</a><span class="Delimiter">(</span><span class="Normal">char</span> hex_byte1<span class="Delimiter">,</span> <span class="Normal">char</span> hex_byte2<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L203" class="LineNr">203 </span>  <span class="Identifier">return</span> <a href='010core.cc.html#L205'>to_hex_num</a><span class="Delimiter">(</span>hex_byte1<span class="Delimiter">)</span>*<span class="Constant">16</span> + <a href='010core.cc.html#L205'>to_hex_num</a><span class="Delimiter">(</span>hex_byte2<span class="Delimiter">);</span>
-<span id="L204" class="LineNr">204 </span><span class="Delimiter">}</span>
-<span id="L205" class="LineNr">205 </span><span class="Normal">uint8_t</span> <a href='010core.cc.html#L205'>to_hex_num</a><span class="Delimiter">(</span><span class="Normal">char</span> c<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L206" class="LineNr">206 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'0'</span> &amp;&amp; c &lt;= <span class="Constant">'9'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c - <span class="Constant">'0'</span><span class="Delimiter">;</span>
-<span id="L207" class="LineNr">207 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'a'</span> &amp;&amp; c &lt;= <span class="Constant">'f'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c - <span class="Constant">'a'</span> + <span class="Constant">10</span><span class="Delimiter">;</span>
-<span id="L208" class="LineNr">208 </span>  assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
-<span id="L209" class="LineNr">209 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L210" class="LineNr">210 </span><span class="Delimiter">}</span>
-<span id="L211" class="LineNr">211 </span>
-<span id="L212" class="LineNr">212 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span> <a href='010core.cc.html#L212'>next</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L213" class="LineNr">213 </span>  <span class="Identifier">return</span> <a href='010core.cc.html#L65'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>EIP++<span class="Delimiter">);</span>
-<span id="L214" class="LineNr">214 </span><span class="Delimiter">}</span>
-<span id="L215" class="LineNr">215 </span>
-<span id="L216" class="LineNr">216 </span><span class="Comment">// read a 32-bit immediate in little-endian order from the instruction stream</span>
-<span id="L217" class="LineNr">217 </span><span class="Normal">int32_t</span> <a href='010core.cc.html#L217'>imm32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L218" class="LineNr">218 </span>  <span class="Normal">int32_t</span> result = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
-<span id="L219" class="LineNr">219 </span>  result |= <span class="Delimiter">(</span><a href='010core.cc.html#L212'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
-<span id="L220" class="LineNr">220 </span>  result |= <span class="Delimiter">(</span><a href='010core.cc.html#L212'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
-<span id="L221" class="LineNr">221 </span>  result |= <span class="Delimiter">(</span><a href='010core.cc.html#L212'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">24</span><span class="Delimiter">);</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L223" class="LineNr">223 </span><span class="Delimiter">}</span>
-<span id="L224" class="LineNr">224 </span>
-<span id="L225" class="LineNr">225 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L226" class="LineNr">226 </span><span class="PreProc">#include </span><span class="Constant">&lt;iomanip&gt;</span>
-<span id="L227" class="LineNr">227 </span><span class="PreProc">#define HEXBYTE  std::hex &lt;&lt; std::setw(</span><span class="Constant">2</span><span class="PreProc">) &lt;&lt; std::setfill(</span><span class="Constant">'0'</span><span class="PreProc">)</span>
-<span id="L228" class="LineNr">228 </span><span class="PreProc">#define HEXWORD  std::hex &lt;&lt; std::setw(</span><span class="Constant">8</span><span class="PreProc">) &lt;&lt; std::setfill(</span><span class="Constant">'0'</span><span class="PreProc">)</span>
-<span id="L229" class="LineNr">229 </span><span class="Comment">// ugly that iostream doesn't print uint8_t as an integer</span>
-<span id="L230" class="LineNr">230 </span><span class="PreProc">#define NUM(X) </span><span class="Normal">static_cast</span><span class="PreProc">&lt;</span><span class="Normal">int</span><span class="PreProc">&gt;(X)</span>
-<span id="L231" class="LineNr">231 </span><span class="PreProc">#include </span><span class="Constant">&lt;stdint.h&gt;</span>
+<span id="L78" class="LineNr"> 78 </span><span class="SalientComment">//:: core interpreter loop</span>
+<span id="L79" class="LineNr"> 79 </span>
+<span id="L80" class="LineNr"> 80 </span><span class="Delimiter">:(scenario add_imm32_to_eax)</span>
+<span id="L81" class="LineNr"> 81 </span><span class="Comment"># In scenarios, programs are a series of hex bytes, each (variable-length)</span>
+<span id="L82" class="LineNr"> 82 </span><span class="Comment"># instruction on one line.</span>
+<span id="L83" class="LineNr"> 83 </span>#
+<span id="L84" class="LineNr"> 84 </span><span class="Comment"># x86 instructions consist of the following parts (see cheatsheet.pdf):</span>
+<span id="L85" class="LineNr"> 85 </span><span class="Comment">#   opcode        ModR/M                    SIB                   displacement    immediate</span>
+<span id="L86" class="LineNr"> 86 </span><span class="Comment">#   instruction   mod, reg, Reg/Mem bits    scale, index, base</span>
+<span id="L87" class="LineNr"> 87 </span><span class="Comment">#   1-3 bytes     0/1 byte                  0/1 byte              0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L88" class="LineNr"> 88 </span>  <span class="Conceal">¦</span> <span class="PreProc">0</span><span class="Constant">5</span>                                                                            0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to EAX</span>
+<span id="L89" class="LineNr"> 89 </span><span class="Comment"># All hex bytes must be exactly 2 characters each. No '0x' prefixes.</span>
+<span id="L90" class="LineNr"> 90 </span><span class="traceContains">+load: 1 -&gt; 05</span>
+<span id="L91" class="LineNr"> 91 </span><span class="traceContains">+load: 2 -&gt; 0a</span>
+<span id="L92" class="LineNr"> 92 </span><span class="traceContains">+load: 3 -&gt; 0b</span>
+<span id="L93" class="LineNr"> 93 </span><span class="traceContains">+load: 4 -&gt; 0c</span>
+<span id="L94" class="LineNr"> 94 </span><span class="traceContains">+load: 5 -&gt; 0d</span>
+<span id="L95" class="LineNr"> 95 </span><span class="traceContains">+run: add <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a to <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a></span>
+<span id="L96" class="LineNr"> 96 </span><span class="traceContains">+run: storing 0x0d0c0b0a</span>
+<span id="L97" class="LineNr"> 97 </span>
+<span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(code)</span>
+<span id="L99" class="LineNr"> 99 </span><span class="Comment">// helper for tests: load a program into memory from a textual representation</span>
+<span id="L100" class="LineNr">100 </span><span class="Comment">// of its bytes, and run it</span>
+<span id="L101" class="LineNr">101 </span><span class="Normal">void</span> <a href='010core.cc.html#L101'>run</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L102" class="LineNr">102 </span>  <a href='010core.cc.html#L154'>load_program</a><span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
+<span id="L103" class="LineNr">103 </span>  <a href='010core.cc.html#L23'>EIP</a> = <span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// preserve null pointer</span>
+<span id="L104" class="LineNr">104 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010core.cc.html#L23'>EIP</a> &lt; <a href='010core.cc.html#L68'>End_of_program</a><span class="Delimiter">)</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L109'>run_one_instruction</a><span class="Delimiter">();</span>
+<span id="L106" class="LineNr">106 </span><span class="Delimiter">}</span>
+<span id="L107" class="LineNr">107 </span>
+<span id="L108" class="LineNr">108 </span><span class="Comment">// skeleton of how x86 instructions are decoded</span>
+<span id="L109" class="LineNr">109 </span><span class="Normal">void</span> <a href='010core.cc.html#L109'>run_one_instruction</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L110" class="LineNr">110 </span>  <span class="Normal">uint8_t</span> op=<span class="Constant">0</span><span class="Delimiter">,</span> op2=<span class="Constant">0</span><span class="Delimiter">,</span> op3=<span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L111" class="LineNr">111 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;inst: 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; <a href='010core.cc.html#L23'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L112" class="LineNr">112 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>op = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L113" class="LineNr">113 </span>  <span class="Normal">case</span> <span class="Constant">0xf4</span>:  <span class="Comment">// hlt</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> = <a href='010core.cc.html#L68'>End_of_program</a><span class="Delimiter">;</span>
+<span id="L115" class="LineNr">115 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L116" class="LineNr">116 </span>  <span class="Comment">// our first opcode</span>
+<span id="L117" class="LineNr">117 </span>  <span class="Normal">case</span> <span class="Constant">0x05</span>: <span class="Delimiter">{</span>  <span class="Comment">// add imm32 to EAX</span>
+<span id="L118" class="LineNr">118 </span>  <span class="Conceal">¦</span> <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
+<span id="L119" class="LineNr">119 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to <a href='010core.cc.html#L17'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L120" class="LineNr">120 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L43'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L122" class="LineNr">122 </span>  <span class="Delimiter">}</span>
+<span id="L123" class="LineNr">123 </span>  <span class="Comment">// End Single-Byte Opcodes</span>
+<span id="L124" class="LineNr">124 </span>  <span class="Normal">case</span> <span class="Constant">0x0f</span>:
+<span id="L125" class="LineNr">125 </span>  <span class="Conceal">¦</span> <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Conceal">¦</span> <span class="Comment">// End Two-Byte Opcodes Starting With 0f</span>
+<span id="L127" class="LineNr">127 </span>  <span class="Conceal">¦</span> <span class="Normal">default</span>:
+<span id="L128" class="LineNr">128 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after 0f: &quot;</span> &lt;&lt; <a href='010core.cc.html#L229'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L129" class="LineNr">129 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L130" class="LineNr">130 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L131" class="LineNr">131 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L132" class="LineNr">132 </span>  <span class="Normal">case</span> <span class="Constant">0xf3</span>:
+<span id="L133" class="LineNr">133 </span>  <span class="Conceal">¦</span> <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L134" class="LineNr">134 </span>  <span class="Conceal">¦</span> <span class="Comment">// End Two-Byte Opcodes Starting With f3</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Conceal">¦</span> <span class="Normal">case</span> <span class="Constant">0x0f</span>:
+<span id="L136" class="LineNr">136 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// End Three-Byte Opcodes Starting With f3 0f</span>
+<span id="L138" class="LineNr">138 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">default</span>:
+<span id="L139" class="LineNr">139 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f3 0f: &quot;</span> &lt;&lt; <a href='010core.cc.html#L229'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L140" class="LineNr">140 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L141" class="LineNr">141 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L142" class="LineNr">142 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L143" class="LineNr">143 </span>  <span class="Conceal">¦</span> <span class="Normal">default</span>:
+<span id="L144" class="LineNr">144 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f3: &quot;</span> &lt;&lt; <a href='010core.cc.html#L229'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L145" class="LineNr">145 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L147" class="LineNr">147 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L148" class="LineNr">148 </span>  <span class="Normal">default</span>:
+<span id="L149" class="LineNr">149 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized opcode: &quot;</span> &lt;&lt; <a href='010core.cc.html#L229'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Delimiter">}</span>
+<span id="L152" class="LineNr">152 </span><span class="Delimiter">}</span>
+<span id="L153" class="LineNr">153 </span>
+<span id="L154" class="LineNr">154 </span><span class="Normal">void</span> <a href='010core.cc.html#L154'>load_program</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L155" class="LineNr">155 </span>  <span class="Normal">uint32_t</span> addr = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L156" class="LineNr">156 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
+<span id="L157" class="LineNr">157 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
+<span id="L158" class="LineNr">158 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L188'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L159" class="LineNr">159 </span>  <span class="Conceal">¦</span> <span class="Normal">char</span> c1 = <a href='010core.cc.html#L177'>next_hex_byte</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L160" class="LineNr">160 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c1 == <span class="cSpecial">'\0'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L161" class="LineNr">161 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L167'>raise</a> &lt;&lt; <span class="Constant">&quot;input program truncated mid-byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L163" class="LineNr">163 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L164" class="LineNr">164 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L165" class="LineNr">165 </span>  <span class="Conceal">¦</span> <span class="Normal">char</span> c2 = <a href='010core.cc.html#L177'>next_hex_byte</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c2 == <span class="cSpecial">'\0'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L167'>raise</a> &lt;&lt; <span class="Constant">&quot;input program truncated mid-byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L168" class="LineNr">168 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L169" class="LineNr">169 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L170" class="LineNr">170 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L67'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>addr<span class="Delimiter">)</span> = <a href='010core.cc.html#L204'>to_byte</a><span class="Delimiter">(</span>c1<span class="Delimiter">,</span> c2<span class="Delimiter">);</span>
+<span id="L171" class="LineNr">171 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010core.cc.html#L229'>HEXBYTE</a> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span><a href='010core.cc.html#L67'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>addr<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L172" class="LineNr">172 </span>  <span class="Conceal">¦</span> addr++<span class="Delimiter">;</span>
+<span id="L173" class="LineNr">173 </span>  <span class="Delimiter">}</span>
+<span id="L174" class="LineNr">174 </span>  <a href='010core.cc.html#L68'>End_of_program</a> = addr<span class="Delimiter">;</span>
+<span id="L175" class="LineNr">175 </span><span class="Delimiter">}</span>
+<span id="L176" class="LineNr">176 </span>
+<span id="L177" class="LineNr">177 </span><span class="Normal">char</span> <a href='010core.cc.html#L177'>next_hex_byte</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L178" class="LineNr">178 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L188'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L179" class="LineNr">179 </span>  <span class="Conceal">¦</span> <span class="Normal">char</span> c = <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
+<span id="L180" class="LineNr">180 </span>  <span class="Conceal">¦</span> in &gt;&gt; c<span class="Delimiter">;</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">' '</span> || c == <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L182" class="LineNr">182 </span>  <span class="Conceal">¦</span> <span class="Normal">while</span> <span class="Delimiter">(</span>c == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L183" class="LineNr">183 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L188'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L184" class="LineNr">184 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> in &gt;&gt; c<span class="Delimiter">;</span>
+<span id="L185" class="LineNr">185 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L186" class="LineNr">186 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> in &gt;&gt; c<span class="Delimiter">;</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L188" class="LineNr">188 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L189" class="LineNr">189 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L190" class="LineNr">190 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L191" class="LineNr">191 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="cSpecial">'\0'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c<span class="Delimiter">;</span>
+<span id="L192" class="LineNr">192 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'0'</span> &amp;&amp; c &lt;= <span class="Constant">'9'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c<span class="Delimiter">;</span>
+<span id="L193" class="LineNr">193 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'a'</span> &amp;&amp; c &lt;= <span class="Constant">'f'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c<span class="Delimiter">;</span>
+<span id="L194" class="LineNr">194 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'A'</span> &amp;&amp; c &lt;= <span class="Constant">'F'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> tolower<span class="Delimiter">(</span>c<span class="Delimiter">);</span>
+<span id="L195" class="LineNr">195 </span>  <span class="Conceal">¦</span> <span class="Comment">// disallow any non-hex characters, including a '0x' prefix</span>
+<span id="L196" class="LineNr">196 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>c<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L197" class="LineNr">197 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L167'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid non-hex character &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>c<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L198" class="LineNr">198 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L199" class="LineNr">199 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L200" class="LineNr">200 </span>  <span class="Delimiter">}</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
+<span id="L202" class="LineNr">202 </span><span class="Delimiter">}</span>
+<span id="L203" class="LineNr">203 </span>
+<span id="L204" class="LineNr">204 </span><span class="Normal">uint8_t</span> <a href='010core.cc.html#L204'>to_byte</a><span class="Delimiter">(</span><span class="Normal">char</span> hex_byte1<span class="Delimiter">,</span> <span class="Normal">char</span> hex_byte2<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Identifier">return</span> <a href='010core.cc.html#L207'>to_hex_num</a><span class="Delimiter">(</span>hex_byte1<span class="Delimiter">)</span>*<span class="Constant">16</span> + <a href='010core.cc.html#L207'>to_hex_num</a><span class="Delimiter">(</span>hex_byte2<span class="Delimiter">);</span>
+<span id="L206" class="LineNr">206 </span><span class="Delimiter">}</span>
+<span id="L207" class="LineNr">207 </span><span class="Normal">uint8_t</span> <a href='010core.cc.html#L207'>to_hex_num</a><span class="Delimiter">(</span><span class="Normal">char</span> c<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L208" class="LineNr">208 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'0'</span> &amp;&amp; c &lt;= <span class="Constant">'9'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c - <span class="Constant">'0'</span><span class="Delimiter">;</span>
+<span id="L209" class="LineNr">209 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'a'</span> &amp;&amp; c &lt;= <span class="Constant">'f'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c - <span class="Constant">'a'</span> + <span class="Constant">10</span><span class="Delimiter">;</span>
+<span id="L210" class="LineNr">210 </span>  assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
+<span id="L211" class="LineNr">211 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L212" class="LineNr">212 </span><span class="Delimiter">}</span>
+<span id="L213" class="LineNr">213 </span>
+<span id="L214" class="LineNr">214 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span> <a href='010core.cc.html#L214'>next</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L215" class="LineNr">215 </span>  <span class="Identifier">return</span> <a href='010core.cc.html#L67'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>EIP++<span class="Delimiter">);</span>
+<span id="L216" class="LineNr">216 </span><span class="Delimiter">}</span>
+<span id="L217" class="LineNr">217 </span>
+<span id="L218" class="LineNr">218 </span><span class="Comment">// read a 32-bit immediate in little-endian order from the instruction stream</span>
+<span id="L219" class="LineNr">219 </span><span class="Normal">int32_t</span> <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L220" class="LineNr">220 </span>  <span class="Normal">int32_t</span> result = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L221" class="LineNr">221 </span>  result |= <span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L222" class="LineNr">222 </span>  result |= <span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
+<span id="L223" class="LineNr">223 </span>  result |= <span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">24</span><span class="Delimiter">);</span>
+<span id="L224" class="LineNr">224 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L225" class="LineNr">225 </span><span class="Delimiter">}</span>
+<span id="L226" class="LineNr">226 </span>
+<span id="L227" class="LineNr">227 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L228" class="LineNr">228 </span><span class="PreProc">#include </span><span class="Constant">&lt;iomanip&gt;</span>
+<span id="L229" class="LineNr">229 </span><span class="PreProc">#define HEXBYTE  std::hex &lt;&lt; std::setw(</span><span class="Constant">2</span><span class="PreProc">) &lt;&lt; std::setfill(</span><span class="Constant">'0'</span><span class="PreProc">)</span>
+<span id="L230" class="LineNr">230 </span><span class="PreProc">#define HEXWORD  std::hex &lt;&lt; std::setw(</span><span class="Constant">8</span><span class="PreProc">) &lt;&lt; std::setfill(</span><span class="Constant">'0'</span><span class="PreProc">)</span>
+<span id="L231" class="LineNr">231 </span><span class="Comment">// ugly that iostream doesn't print uint8_t as an integer</span>
+<span id="L232" class="LineNr">232 </span><span class="PreProc">#define NUM(X) </span><span class="Normal">static_cast</span><span class="PreProc">&lt;</span><span class="Normal">int</span><span class="PreProc">&gt;(X)</span>
+<span id="L233" class="LineNr">233 </span><span class="PreProc">#include </span><span class="Constant">&lt;stdint.h&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/011direct_addressing.cc.html b/html/subx/011direct_addressing.cc.html
index 2b96747f..1738b2a2 100644
--- a/html/subx/011direct_addressing.cc.html
+++ b/html/subx/011direct_addressing.cc.html
@@ -70,17 +70,17 @@ if ('onhashchange' in window) {
 <span id="L5" class="LineNr">  5 </span><span class="Special">% Reg[3].i = 1;</span>
 <span id="L6" class="LineNr">  6 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L7" class="LineNr">  7 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  d8                                      <span class="Comment"># add EBX (reg 3) to EAX (reg 0)</span>
-<span id="L8" class="LineNr">  8 </span><span class="traceContains">+run: add <a href='010core.cc.html#L15'>reg</a> 3 to effective address</span>
-<span id="L9" class="LineNr">  9 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 0</span>
+<span id="L8" class="LineNr">  8 </span><span class="traceContains">+run: add <a href='010core.cc.html#L17'>reg</a> 3 to effective address</span>
+<span id="L9" class="LineNr">  9 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
 <span id="L10" class="LineNr"> 10 </span><span class="traceContains">+run: storing 0x00000011</span>
 <span id="L11" class="LineNr"> 11 </span>
 <span id="L12" class="LineNr"> 12 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L13" class="LineNr"> 13 </span><span class="Normal">case</span> <span class="Constant">0x01</span>: <span class="Delimiter">{</span>  <span class="Comment">// add r32 to r/m32</span>
-<span id="L14" class="LineNr"> 14 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
+<span id="L14" class="LineNr"> 14 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L15" class="LineNr"> 15 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L16" class="LineNr"> 16 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add <a href='010core.cc.html#L15'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L16" class="LineNr"> 16 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L17" class="LineNr"> 17 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L18" class="LineNr"> 18 </span>  <a href='010core.cc.html#L41'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>
+<span id="L18" class="LineNr"> 18 </span>  <a href='010core.cc.html#L43'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>
 <span id="L19" class="LineNr"> 19 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L20" class="LineNr"> 20 </span><span class="Delimiter">}</span>
 <span id="L21" class="LineNr"> 21 </span>
@@ -96,12 +96,12 @@ if ('onhashchange' in window) {
 <span id="L31" class="LineNr"> 31 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L32" class="LineNr"> 32 </span>  <span class="Normal">case</span> <span class="Constant">3</span>:
 <span id="L33" class="LineNr"> 33 </span>  <span class="Conceal">¦</span> <span class="Comment">// mod 3 is just register direct addressing</span>
-<span id="L34" class="LineNr"> 34 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is <a href='010core.cc.html#L15'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L34" class="LineNr"> 34 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Conceal">¦</span> result = &amp;Reg[rm]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
 <span id="L36" class="LineNr"> 36 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L37" class="LineNr"> 37 </span>  <span class="Comment">// End Mod Special-cases</span>
 <span id="L38" class="LineNr"> 38 </span>  <span class="Normal">default</span>:
-<span id="L39" class="LineNr"> 39 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized mod bits: &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>mod<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L39" class="LineNr"> 39 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized mod bits: &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>mod<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L40" class="LineNr"> 40 </span>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L41" class="LineNr"> 41 </span>  <span class="Delimiter">}</span>
 <span id="L42" class="LineNr"> 42 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
@@ -114,17 +114,17 @@ if ('onhashchange' in window) {
 <span id="L49" class="LineNr"> 49 </span><span class="Special">% Reg[3].i = 1;</span>
 <span id="L50" class="LineNr"> 50 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L51" class="LineNr"> 51 </span>  <span class="Constant">29</span>  d8                                      <span class="Comment"># subtract EBX (reg 3) from EAX (reg 0)</span>
-<span id="L52" class="LineNr"> 52 </span><span class="traceContains">+run: subtract <a href='010core.cc.html#L15'>reg</a> 3 from effective address</span>
-<span id="L53" class="LineNr"> 53 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 0</span>
+<span id="L52" class="LineNr"> 52 </span><span class="traceContains">+run: subtract <a href='010core.cc.html#L17'>reg</a> 3 from effective address</span>
+<span id="L53" class="LineNr"> 53 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
 <span id="L54" class="LineNr"> 54 </span><span class="traceContains">+run: storing 0x00000009</span>
 <span id="L55" class="LineNr"> 55 </span>
 <span id="L56" class="LineNr"> 56 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L57" class="LineNr"> 57 </span><span class="Normal">case</span> <span class="Constant">0x29</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract r32 from r/m32</span>
-<span id="L58" class="LineNr"> 58 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L59" class="LineNr"> 59 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L60" class="LineNr"> 60 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract <a href='010core.cc.html#L15'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; from effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L60" class="LineNr"> 60 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; from effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L61" class="LineNr"> 61 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L62" class="LineNr"> 62 </span>  <a href='010core.cc.html#L41'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>
+<span id="L62" class="LineNr"> 62 </span>  <a href='010core.cc.html#L43'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>
 <span id="L63" class="LineNr"> 63 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L64" class="LineNr"> 64 </span><span class="Delimiter">}</span>
 <span id="L65" class="LineNr"> 65 </span>
@@ -135,17 +135,17 @@ if ('onhashchange' in window) {
 <span id="L70" class="LineNr"> 70 </span><span class="Special">% Reg[3].i = 0x000000ff;</span>
 <span id="L71" class="LineNr"> 71 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L72" class="LineNr"> 72 </span>  <span class="Constant">21</span>  d8                                      <span class="Comment"># and EBX (reg 3) with destination EAX (reg 0)</span>
-<span id="L73" class="LineNr"> 73 </span><span class="traceContains">+run: and <a href='010core.cc.html#L15'>reg</a> 3 with effective address</span>
-<span id="L74" class="LineNr"> 74 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 0</span>
+<span id="L73" class="LineNr"> 73 </span><span class="traceContains">+run: and <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
+<span id="L74" class="LineNr"> 74 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
 <span id="L75" class="LineNr"> 75 </span><span class="traceContains">+run: storing 0x0000000d</span>
 <span id="L76" class="LineNr"> 76 </span>
 <span id="L77" class="LineNr"> 77 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L78" class="LineNr"> 78 </span><span class="Normal">case</span> <span class="Constant">0x21</span>: <span class="Delimiter">{</span>  <span class="Comment">// and r32 with r/m32</span>
-<span id="L79" class="LineNr"> 79 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
+<span id="L79" class="LineNr"> 79 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L80" class="LineNr"> 80 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L81" class="LineNr"> 81 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and <a href='010core.cc.html#L15'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L81" class="LineNr"> 81 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L82" class="LineNr"> 82 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L83" class="LineNr"> 83 </span>  <a href='010core.cc.html#L53'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L83" class="LineNr"> 83 </span>  <a href='010core.cc.html#L55'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L84" class="LineNr"> 84 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L85" class="LineNr"> 85 </span><span class="Delimiter">}</span>
 <span id="L86" class="LineNr"> 86 </span>
@@ -156,17 +156,17 @@ if ('onhashchange' in window) {
 <span id="L91" class="LineNr"> 91 </span><span class="Special">% Reg[3].i = 0xa0b0c0d0;</span>
 <span id="L92" class="LineNr"> 92 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L93" class="LineNr"> 93 </span>  <span class="Error">09</span>  d8                                      <span class="Comment"># or EBX (reg 3) with destination EAX (reg 0)</span>
-<span id="L94" class="LineNr"> 94 </span><span class="traceContains">+run: or <a href='010core.cc.html#L15'>reg</a> 3 with effective address</span>
-<span id="L95" class="LineNr"> 95 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 0</span>
+<span id="L94" class="LineNr"> 94 </span><span class="traceContains">+run: or <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
+<span id="L95" class="LineNr"> 95 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
 <span id="L96" class="LineNr"> 96 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
 <span id="L97" class="LineNr"> 97 </span>
 <span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L99" class="LineNr"> 99 </span><span class="Normal">case</span> <span class="Constant">0x09</span>: <span class="Delimiter">{</span>  <span class="Comment">// or r32 with r/m32</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
+<span id="L100" class="LineNr">100 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L102" class="LineNr">102 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or <a href='010core.cc.html#L15'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L102" class="LineNr">102 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L103" class="LineNr">103 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L104" class="LineNr">104 </span>  <a href='010core.cc.html#L53'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L104" class="LineNr">104 </span>  <a href='010core.cc.html#L55'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L106" class="LineNr">106 </span><span class="Delimiter">}</span>
 <span id="L107" class="LineNr">107 </span>
@@ -177,17 +177,17 @@ if ('onhashchange' in window) {
 <span id="L112" class="LineNr">112 </span><span class="Special">% Reg[3].i = 0xaabbc0d0;</span>
 <span id="L113" class="LineNr">113 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L114" class="LineNr">114 </span>  <span class="Constant">31</span>  d8                                      <span class="Comment"># xor EBX (reg 3) with destination EAX (reg 0)</span>
-<span id="L115" class="LineNr">115 </span><span class="traceContains">+run: xor <a href='010core.cc.html#L15'>reg</a> 3 with effective address</span>
-<span id="L116" class="LineNr">116 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 0</span>
+<span id="L115" class="LineNr">115 </span><span class="traceContains">+run: xor <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
+<span id="L116" class="LineNr">116 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
 <span id="L117" class="LineNr">117 </span><span class="traceContains">+run: storing 0xa0b0ccdd</span>
 <span id="L118" class="LineNr">118 </span>
 <span id="L119" class="LineNr">119 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L120" class="LineNr">120 </span><span class="Normal">case</span> <span class="Constant">0x31</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
-<span id="L121" class="LineNr">121 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L122" class="LineNr">122 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L123" class="LineNr">123 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor <a href='010core.cc.html#L15'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L123" class="LineNr">123 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L124" class="LineNr">124 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L125" class="LineNr">125 </span>  <a href='010core.cc.html#L53'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L125" class="LineNr">125 </span>  <a href='010core.cc.html#L55'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L126" class="LineNr">126 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L127" class="LineNr">127 </span><span class="Delimiter">}</span>
 <span id="L128" class="LineNr">128 </span>
@@ -198,19 +198,19 @@ if ('onhashchange' in window) {
 <span id="L133" class="LineNr">133 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L134" class="LineNr">134 </span>  f7  c3                                      <span class="Comment"># not EBX (reg 3)</span>
 <span id="L135" class="LineNr">135 </span><span class="traceContains">+run: 'not' of effective address</span>
-<span id="L136" class="LineNr">136 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L136" class="LineNr">136 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L137" class="LineNr">137 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
 <span id="L138" class="LineNr">138 </span>
 <span id="L139" class="LineNr">139 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L140" class="LineNr">140 </span><span class="Normal">case</span> <span class="Constant">0xf7</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
+<span id="L141" class="LineNr">141 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L142" class="LineNr">142 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'not' of effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L143" class="LineNr">143 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L144" class="LineNr">144 </span>  *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
-<span id="L145" class="LineNr">145 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L228'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L145" class="LineNr">145 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L146" class="LineNr">146 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
 <span id="L147" class="LineNr">147 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L148" class="LineNr">148 </span>  <a href='010core.cc.html#L31'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L148" class="LineNr">148 </span>  <a href='010core.cc.html#L33'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span>
 <span id="L149" class="LineNr">149 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L150" class="LineNr">150 </span><span class="Delimiter">}</span>
 <span id="L151" class="LineNr">151 </span>
@@ -221,23 +221,23 @@ if ('onhashchange' in window) {
 <span id="L156" class="LineNr">156 </span><span class="Special">% Reg[3].i = 0x0a0b0c07;</span>
 <span id="L157" class="LineNr">157 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L158" class="LineNr">158 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX (reg 3) with EAX (reg 0)</span>
-<span id="L159" class="LineNr">159 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L15'>reg</a> 3 with effective address</span>
-<span id="L160" class="LineNr">160 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 0</span>
+<span id="L159" class="LineNr">159 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
+<span id="L160" class="LineNr">160 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
 <span id="L161" class="LineNr">161 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
 <span id="L162" class="LineNr">162 </span>
 <span id="L163" class="LineNr">163 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L164" class="LineNr">164 </span><span class="Normal">case</span> <span class="Constant">0x39</span>: <span class="Delimiter">{</span>  <span class="Comment">// set SF if r/m32 &lt; r32</span>
-<span id="L165" class="LineNr">165 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
+<span id="L165" class="LineNr">165 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L166" class="LineNr">166 </span>  <span class="Normal">uint8_t</span> reg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L167" class="LineNr">167 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare <a href='010core.cc.html#L15'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L167" class="LineNr">167 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L168" class="LineNr">168 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L169" class="LineNr">169 </span>  <span class="Normal">int32_t</span> arg2 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
 <span id="L170" class="LineNr">170 </span>  <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
 <span id="L171" class="LineNr">171 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L172" class="LineNr">172 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L173" class="LineNr">173 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L174" class="LineNr">174 </span>  <a href='010core.cc.html#L31'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L175" class="LineNr">175 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010core.cc.html#L31'>OF</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L174" class="LineNr">174 </span>  <a href='010core.cc.html#L33'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L175" class="LineNr">175 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010core.cc.html#L33'>OF</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L176" class="LineNr">176 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L177" class="LineNr">177 </span><span class="Delimiter">}</span>
 <span id="L178" class="LineNr">178 </span>
@@ -246,8 +246,8 @@ if ('onhashchange' in window) {
 <span id="L181" class="LineNr">181 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
 <span id="L182" class="LineNr">182 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L183" class="LineNr">183 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX (reg 3) with EAX (reg 0)</span>
-<span id="L184" class="LineNr">184 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L15'>reg</a> 3 with effective address</span>
-<span id="L185" class="LineNr">185 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 0</span>
+<span id="L184" class="LineNr">184 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
+<span id="L185" class="LineNr">185 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
 <span id="L186" class="LineNr">186 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
 <span id="L187" class="LineNr">187 </span>
 <span id="L188" class="LineNr">188 </span><span class="Delimiter">:(scenario compare_r32_with_r32_equal)</span>
@@ -255,8 +255,8 @@ if ('onhashchange' in window) {
 <span id="L190" class="LineNr">190 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
 <span id="L191" class="LineNr">191 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L192" class="LineNr">192 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX (reg 3) with EAX (reg 0)</span>
-<span id="L193" class="LineNr">193 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L15'>reg</a> 3 with effective address</span>
-<span id="L194" class="LineNr">194 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 0</span>
+<span id="L193" class="LineNr">193 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
+<span id="L194" class="LineNr">194 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
 <span id="L195" class="LineNr">195 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
 <span id="L196" class="LineNr">196 </span>
 <span id="L197" class="LineNr">197 </span><span class="SalientComment">//:: copy (mov)</span>
@@ -265,18 +265,18 @@ if ('onhashchange' in window) {
 <span id="L200" class="LineNr">200 </span><span class="Special">% Reg[3].i = 0xaf;</span>
 <span id="L201" class="LineNr">201 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L202" class="LineNr">202 </span>  <span class="Constant">89</span>  d8                                      <span class="Comment"># copy EBX (reg 3) to EAX (reg 0)</span>
-<span id="L203" class="LineNr">203 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L15'>reg</a> 3 to effective address</span>
-<span id="L204" class="LineNr">204 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 0</span>
+<span id="L203" class="LineNr">203 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L17'>reg</a> 3 to effective address</span>
+<span id="L204" class="LineNr">204 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 0</span>
 <span id="L205" class="LineNr">205 </span><span class="traceContains">+run: storing 0x000000af</span>
 <span id="L206" class="LineNr">206 </span>
 <span id="L207" class="LineNr">207 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L208" class="LineNr">208 </span><span class="Normal">case</span> <span class="Constant">0x89</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r32 to r/m32</span>
-<span id="L209" class="LineNr">209 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
+<span id="L209" class="LineNr">209 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L210" class="LineNr">210 </span>  <span class="Normal">uint8_t</span> reg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L211" class="LineNr">211 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='010core.cc.html#L15'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L211" class="LineNr">211 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L212" class="LineNr">212 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L213" class="LineNr">213 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L214" class="LineNr">214 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L228'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L214" class="LineNr">214 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L215" class="LineNr">215 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L216" class="LineNr">216 </span><span class="Delimiter">}</span>
 </pre>
diff --git a/html/subx/012indirect_addressing.cc.html b/html/subx/012indirect_addressing.cc.html
index b64886da..d04c442e 100644
--- a/html/subx/012indirect_addressing.cc.html
+++ b/html/subx/012indirect_addressing.cc.html
@@ -71,7 +71,7 @@ if ('onhashchange' in window) {
 <span id="L6" class="LineNr">  6 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
 <span id="L7" class="LineNr">  7 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L8" class="LineNr">  8 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">18</span>                                     <span class="Comment"># add EBX (reg 3) to *EAX (reg 0)</span>
-<span id="L9" class="LineNr">  9 </span><span class="traceContains">+run: add <a href='010core.cc.html#L15'>reg</a> 3 to effective address</span>
+<span id="L9" class="LineNr">  9 </span><span class="traceContains">+run: add <a href='010core.cc.html#L17'>reg</a> 3 to effective address</span>
 <span id="L10" class="LineNr"> 10 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L11" class="LineNr"> 11 </span><span class="traceContains">+run: storing 0x00000011</span>
 <span id="L12" class="LineNr"> 12 </span>
@@ -80,8 +80,8 @@ if ('onhashchange' in window) {
 <span id="L15" class="LineNr"> 15 </span>  <span class="Comment">// mod 0 is usually indirect addressing</span>
 <span id="L16" class="LineNr"> 16 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L17" class="LineNr"> 17 </span>  <span class="Normal">default</span>:
-<span id="L18" class="LineNr"> 18 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is mem at address 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; Reg[rm]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; (reg &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L19" class="LineNr"> 19 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>Reg[rm]<span class="Delimiter">.</span>u + <span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">int32_t</span><span class="Delimiter">)</span> &lt;= <a href='010core.cc.html#L65'>Mem</a><span class="Delimiter">.</span>size<span class="Delimiter">());</span>
+<span id="L18" class="LineNr"> 18 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is mem at address 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; Reg[rm]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; (reg &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L19" class="LineNr"> 19 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>Reg[rm]<span class="Delimiter">.</span>u + <span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">int32_t</span><span class="Delimiter">)</span> &lt;= <a href='010core.cc.html#L67'>Mem</a><span class="Delimiter">.</span>size<span class="Delimiter">());</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Conceal">¦</span> result = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">int32_t</span>*&gt;<span class="Delimiter">(</span>&amp;Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">));</span>  <span class="Comment">// rely on the host itself being in little-endian order</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L22" class="LineNr"> 22 </span>  <span class="Comment">// End Mod 0 Special-cases</span>
@@ -96,17 +96,17 @@ if ('onhashchange' in window) {
 <span id="L31" class="LineNr"> 31 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
 <span id="L32" class="LineNr"> 32 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L33" class="LineNr"> 33 </span>  <span class="PreProc">0</span><span class="Constant">3</span>  <span class="Constant">18</span>                                      <span class="Comment"># add *EAX (reg 0) to EBX (reg 3)</span>
-<span id="L34" class="LineNr"> 34 </span><span class="traceContains">+run: add effective address to <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L34" class="LineNr"> 34 </span><span class="traceContains">+run: add effective address to <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L35" class="LineNr"> 35 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L36" class="LineNr"> 36 </span><span class="traceContains">+run: storing 0x00000011</span>
 <span id="L37" class="LineNr"> 37 </span>
 <span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L39" class="LineNr"> 39 </span><span class="Normal">case</span> <span class="Constant">0x03</span>: <span class="Delimiter">{</span>  <span class="Comment">// add r/m32 to r32</span>
-<span id="L40" class="LineNr"> 40 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
+<span id="L40" class="LineNr"> 40 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L41" class="LineNr"> 41 </span>  <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L42" class="LineNr"> 42 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add effective address to <a href='010core.cc.html#L15'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L42" class="LineNr"> 42 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add effective address to <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L43" class="LineNr"> 43 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L44" class="LineNr"> 44 </span>  <a href='010core.cc.html#L41'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
+<span id="L44" class="LineNr"> 44 </span>  <a href='010core.cc.html#L43'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L46" class="LineNr"> 46 </span><span class="Delimiter">}</span>
 <span id="L47" class="LineNr"> 47 </span>
@@ -118,7 +118,7 @@ if ('onhashchange' in window) {
 <span id="L53" class="LineNr"> 53 </span><span class="Special">% Reg[3].i = 1;</span>
 <span id="L54" class="LineNr"> 54 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L55" class="LineNr"> 55 </span>  <span class="Constant">29</span>  <span class="Constant">18</span>                                      <span class="Comment"># subtract EBX (reg 3) from *EAX (reg 0)</span>
-<span id="L56" class="LineNr"> 56 </span><span class="traceContains">+run: subtract <a href='010core.cc.html#L15'>reg</a> 3 from effective address</span>
+<span id="L56" class="LineNr"> 56 </span><span class="traceContains">+run: subtract <a href='010core.cc.html#L17'>reg</a> 3 from effective address</span>
 <span id="L57" class="LineNr"> 57 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L58" class="LineNr"> 58 </span><span class="traceContains">+run: storing 0x00000009</span>
 <span id="L59" class="LineNr"> 59 </span>
@@ -130,17 +130,17 @@ if ('onhashchange' in window) {
 <span id="L65" class="LineNr"> 65 </span><span class="Special">% Reg[3].i = 10;</span>
 <span id="L66" class="LineNr"> 66 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L67" class="LineNr"> 67 </span>  2b  <span class="Constant">18</span>                                      <span class="Comment"># subtract *EAX (reg 0) from EBX (reg 3)</span>
-<span id="L68" class="LineNr"> 68 </span><span class="traceContains">+run: subtract effective address from <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L68" class="LineNr"> 68 </span><span class="traceContains">+run: subtract effective address from <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L69" class="LineNr"> 69 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L70" class="LineNr"> 70 </span><span class="traceContains">+run: storing 0x00000009</span>
 <span id="L71" class="LineNr"> 71 </span>
 <span id="L72" class="LineNr"> 72 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L73" class="LineNr"> 73 </span><span class="Normal">case</span> <span class="Constant">0x2b</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract r/m32 from r32</span>
-<span id="L74" class="LineNr"> 74 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L75" class="LineNr"> 75 </span>  <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L76" class="LineNr"> 76 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract effective address from <a href='010core.cc.html#L15'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L76" class="LineNr"> 76 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract effective address from <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L77" class="LineNr"> 77 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L78" class="LineNr"> 78 </span>  <a href='010core.cc.html#L41'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
+<span id="L78" class="LineNr"> 78 </span>  <a href='010core.cc.html#L43'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
 <span id="L79" class="LineNr"> 79 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L80" class="LineNr"> 80 </span><span class="Delimiter">}</span>
 <span id="L81" class="LineNr"> 81 </span>
@@ -152,7 +152,7 @@ if ('onhashchange' in window) {
 <span id="L87" class="LineNr"> 87 </span><span class="Special">% Reg[3].i = 0xff;</span>
 <span id="L88" class="LineNr"> 88 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L89" class="LineNr"> 89 </span>  <span class="Constant">21</span>  <span class="Constant">18</span>                                      <span class="Comment"># and EBX (reg 3) with *EAX (reg 0)</span>
-<span id="L90" class="LineNr"> 90 </span><span class="traceContains">+run: and <a href='010core.cc.html#L15'>reg</a> 3 with effective address</span>
+<span id="L90" class="LineNr"> 90 </span><span class="traceContains">+run: and <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
 <span id="L91" class="LineNr"> 91 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L92" class="LineNr"> 92 </span><span class="traceContains">+run: storing 0x0000000d</span>
 <span id="L93" class="LineNr"> 93 </span>
@@ -164,17 +164,17 @@ if ('onhashchange' in window) {
 <span id="L99" class="LineNr"> 99 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
 <span id="L100" class="LineNr">100 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Constant">23</span>  <span class="Constant">18</span>                                      <span class="Comment"># and *EAX (reg 0) with EBX (reg 3)</span>
-<span id="L102" class="LineNr">102 </span><span class="traceContains">+run: and effective address with <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L102" class="LineNr">102 </span><span class="traceContains">+run: and effective address with <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L103" class="LineNr">103 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L104" class="LineNr">104 </span><span class="traceContains">+run: storing 0x0000000d</span>
 <span id="L105" class="LineNr">105 </span>
 <span id="L106" class="LineNr">106 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L107" class="LineNr">107 </span><span class="Normal">case</span> <span class="Constant">0x23</span>: <span class="Delimiter">{</span>  <span class="Comment">// and r/m32 with r32</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
+<span id="L108" class="LineNr">108 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L110" class="LineNr">110 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and effective address with <a href='010core.cc.html#L15'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L110" class="LineNr">110 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and effective address with <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L111" class="LineNr">111 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L112" class="LineNr">112 </span>  <a href='010core.cc.html#L53'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
+<span id="L112" class="LineNr">112 </span>  <a href='010core.cc.html#L55'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
 <span id="L113" class="LineNr">113 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L114" class="LineNr">114 </span><span class="Delimiter">}</span>
 <span id="L115" class="LineNr">115 </span>
@@ -186,7 +186,7 @@ if ('onhashchange' in window) {
 <span id="L121" class="LineNr">121 </span><span class="Special">% Reg[3].i = 0xa0b0c0d0;</span>
 <span id="L122" class="LineNr">122 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L123" class="LineNr">123 </span>  <span class="Error">09</span>  <span class="Constant">18</span>                                      <span class="Comment"># or EBX (reg 3) with *EAX (reg 0)</span>
-<span id="L124" class="LineNr">124 </span><span class="traceContains">+run: or <a href='010core.cc.html#L15'>reg</a> 3 with effective address</span>
+<span id="L124" class="LineNr">124 </span><span class="traceContains">+run: or <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
 <span id="L125" class="LineNr">125 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L126" class="LineNr">126 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
 <span id="L127" class="LineNr">127 </span>
@@ -198,17 +198,17 @@ if ('onhashchange' in window) {
 <span id="L133" class="LineNr">133 </span><span class="Special">% Reg[3].i = 0xa0b0c0d0;</span>
 <span id="L134" class="LineNr">134 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L135" class="LineNr">135 </span>  0b  <span class="Constant">18</span>                                      <span class="Comment"># or *EAX (reg 0) with EBX (reg 3)</span>
-<span id="L136" class="LineNr">136 </span><span class="traceContains">+run: or effective address with <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L136" class="LineNr">136 </span><span class="traceContains">+run: or effective address with <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L137" class="LineNr">137 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L138" class="LineNr">138 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
 <span id="L139" class="LineNr">139 </span>
 <span id="L140" class="LineNr">140 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L141" class="LineNr">141 </span><span class="Normal">case</span> <span class="Constant">0x0b</span>: <span class="Delimiter">{</span>  <span class="Comment">// or r/m32 with r32</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
+<span id="L142" class="LineNr">142 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L143" class="LineNr">143 </span>  <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L144" class="LineNr">144 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or effective address with <a href='010core.cc.html#L15'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L144" class="LineNr">144 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or effective address with <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L145" class="LineNr">145 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L146" class="LineNr">146 </span>  <a href='010core.cc.html#L53'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span>  <a href='010core.cc.html#L55'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
 <span id="L147" class="LineNr">147 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L148" class="LineNr">148 </span><span class="Delimiter">}</span>
 <span id="L149" class="LineNr">149 </span>
@@ -220,7 +220,7 @@ if ('onhashchange' in window) {
 <span id="L155" class="LineNr">155 </span><span class="Special">% Reg[3].i = 0xa0b0c0d0;</span>
 <span id="L156" class="LineNr">156 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L157" class="LineNr">157 </span>  <span class="Constant">31</span>  <span class="Constant">18</span>                                      <span class="Comment"># xor EBX (reg 3) with *EAX (reg 0)</span>
-<span id="L158" class="LineNr">158 </span><span class="traceContains">+run: xor <a href='010core.cc.html#L15'>reg</a> 3 with effective address</span>
+<span id="L158" class="LineNr">158 </span><span class="traceContains">+run: xor <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
 <span id="L159" class="LineNr">159 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L160" class="LineNr">160 </span><span class="traceContains">+run: storing 0x0a0bccdd</span>
 <span id="L161" class="LineNr">161 </span>
@@ -232,17 +232,17 @@ if ('onhashchange' in window) {
 <span id="L167" class="LineNr">167 </span><span class="Special">% Reg[3].i = 0xa0b0c0d0;</span>
 <span id="L168" class="LineNr">168 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L169" class="LineNr">169 </span>  <span class="Constant">33</span>  <span class="Constant">18</span>                                      <span class="Comment"># xor *EAX (reg 0) with EBX (reg 3)</span>
-<span id="L170" class="LineNr">170 </span><span class="traceContains">+run: xor effective address with <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L170" class="LineNr">170 </span><span class="traceContains">+run: xor effective address with <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L171" class="LineNr">171 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L172" class="LineNr">172 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
 <span id="L173" class="LineNr">173 </span>
 <span id="L174" class="LineNr">174 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L175" class="LineNr">175 </span><span class="Normal">case</span> <span class="Constant">0x33</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r/m32 with r32</span>
-<span id="L176" class="LineNr">176 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
+<span id="L176" class="LineNr">176 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L177" class="LineNr">177 </span>  <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L178" class="LineNr">178 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor effective address with <a href='010core.cc.html#L15'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L178" class="LineNr">178 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor effective address with <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L179" class="LineNr">179 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L180" class="LineNr">180 </span>  <a href='010core.cc.html#L53'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
+<span id="L180" class="LineNr">180 </span>  <a href='010core.cc.html#L55'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
 <span id="L181" class="LineNr">181 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L182" class="LineNr">182 </span><span class="Delimiter">}</span>
 <span id="L183" class="LineNr">183 </span>
@@ -266,7 +266,7 @@ if ('onhashchange' in window) {
 <span id="L201" class="LineNr">201 </span><span class="Special">% Reg[3].i = 0x0a0b0c07;</span>
 <span id="L202" class="LineNr">202 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L203" class="LineNr">203 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX (reg 3) with *EAX (reg 0)</span>
-<span id="L204" class="LineNr">204 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L15'>reg</a> 3 with effective address</span>
+<span id="L204" class="LineNr">204 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
 <span id="L205" class="LineNr">205 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L206" class="LineNr">206 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
 <span id="L207" class="LineNr">207 </span>
@@ -276,7 +276,7 @@ if ('onhashchange' in window) {
 <span id="L211" class="LineNr">211 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
 <span id="L212" class="LineNr">212 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L213" class="LineNr">213 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX (reg 3) with *EAX (reg 0)</span>
-<span id="L214" class="LineNr">214 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L15'>reg</a> 3 with effective address</span>
+<span id="L214" class="LineNr">214 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
 <span id="L215" class="LineNr">215 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L216" class="LineNr">216 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
 <span id="L217" class="LineNr">217 </span>
@@ -286,7 +286,7 @@ if ('onhashchange' in window) {
 <span id="L221" class="LineNr">221 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
 <span id="L222" class="LineNr">222 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L223" class="LineNr">223 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX (reg 3) with *EAX (reg 0)</span>
-<span id="L224" class="LineNr">224 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L15'>reg</a> 3 with effective address</span>
+<span id="L224" class="LineNr">224 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> 3 with effective address</span>
 <span id="L225" class="LineNr">225 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L226" class="LineNr">226 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
 <span id="L227" class="LineNr">227 </span>
@@ -298,23 +298,23 @@ if ('onhashchange' in window) {
 <span id="L233" class="LineNr">233 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
 <span id="L234" class="LineNr">234 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L235" class="LineNr">235 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX (reg 0) with EBX (reg 3)</span>
-<span id="L236" class="LineNr">236 </span><span class="traceContains">+run: compare effective address with <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L236" class="LineNr">236 </span><span class="traceContains">+run: compare effective address with <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L237" class="LineNr">237 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L238" class="LineNr">238 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
 <span id="L239" class="LineNr">239 </span>
 <span id="L240" class="LineNr">240 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L241" class="LineNr">241 </span><span class="Normal">case</span> <span class="Constant">0x3b</span>: <span class="Delimiter">{</span>  <span class="Comment">// set SF if r32 &lt; r/m32</span>
-<span id="L242" class="LineNr">242 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
+<span id="L242" class="LineNr">242 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L243" class="LineNr">243 </span>  <span class="Normal">uint8_t</span> reg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L244" class="LineNr">244 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare effective address with <a href='010core.cc.html#L15'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L244" class="LineNr">244 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare effective address with <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L245" class="LineNr">245 </span>  <span class="Normal">int32_t</span> arg1 = Reg[reg1]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
 <span id="L246" class="LineNr">246 </span>  <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L247" class="LineNr">247 </span>  <span class="Normal">int32_t</span> tmp1 = arg1 - *arg2<span class="Delimiter">;</span>
 <span id="L248" class="LineNr">248 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L249" class="LineNr">249 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L250" class="LineNr">250 </span>  <span class="Normal">int64_t</span> tmp2 = arg1 - *arg2<span class="Delimiter">;</span>
-<span id="L251" class="LineNr">251 </span>  <a href='010core.cc.html#L31'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L252" class="LineNr">252 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010core.cc.html#L31'>OF</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L251" class="LineNr">251 </span>  <a href='010core.cc.html#L33'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L252" class="LineNr">252 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010core.cc.html#L33'>OF</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L253" class="LineNr">253 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L254" class="LineNr">254 </span><span class="Delimiter">}</span>
 <span id="L255" class="LineNr">255 </span>
@@ -324,7 +324,7 @@ if ('onhashchange' in window) {
 <span id="L259" class="LineNr">259 </span><span class="Special">% Reg[3].i = 0x0a0b0c07;</span>
 <span id="L260" class="LineNr">260 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L261" class="LineNr">261 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX (reg 0) with EBX (reg 3)</span>
-<span id="L262" class="LineNr">262 </span><span class="traceContains">+run: compare effective address with <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L262" class="LineNr">262 </span><span class="traceContains">+run: compare effective address with <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L263" class="LineNr">263 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L264" class="LineNr">264 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
 <span id="L265" class="LineNr">265 </span>
@@ -334,7 +334,7 @@ if ('onhashchange' in window) {
 <span id="L269" class="LineNr">269 </span><span class="Special">% Reg[3].i = 0x0a0b0c0d;</span>
 <span id="L270" class="LineNr">270 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L271" class="LineNr">271 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX (reg 0) with EBX (reg 3)</span>
-<span id="L272" class="LineNr">272 </span><span class="traceContains">+run: compare effective address with <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L272" class="LineNr">272 </span><span class="traceContains">+run: compare effective address with <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L273" class="LineNr">273 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L274" class="LineNr">274 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
 <span id="L275" class="LineNr">275 </span>
@@ -345,7 +345,7 @@ if ('onhashchange' in window) {
 <span id="L280" class="LineNr">280 </span><span class="Special">% Reg[0].i = 0x60;</span>
 <span id="L281" class="LineNr">281 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L282" class="LineNr">282 </span>  <span class="Constant">89</span>  <span class="Constant">18</span>                                      <span class="Comment"># copy EBX (reg 3) to *EAX (reg 0)</span>
-<span id="L283" class="LineNr">283 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L15'>reg</a> 3 to effective address</span>
+<span id="L283" class="LineNr">283 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L17'>reg</a> 3 to effective address</span>
 <span id="L284" class="LineNr">284 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L285" class="LineNr">285 </span><span class="traceContains">+run: storing 0x000000af</span>
 <span id="L286" class="LineNr">286 </span>
@@ -356,18 +356,18 @@ if ('onhashchange' in window) {
 <span id="L291" class="LineNr">291 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x000000af);</span>
 <span id="L292" class="LineNr">292 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L293" class="LineNr">293 </span>  8b  <span class="Constant">18</span>                                      <span class="Comment"># copy *EAX (reg 0) to EBX (reg 3)</span>
-<span id="L294" class="LineNr">294 </span><span class="traceContains">+run: copy effective address to <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L294" class="LineNr">294 </span><span class="traceContains">+run: copy effective address to <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L295" class="LineNr">295 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
 <span id="L296" class="LineNr">296 </span><span class="traceContains">+run: storing 0x000000af</span>
 <span id="L297" class="LineNr">297 </span>
 <span id="L298" class="LineNr">298 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L299" class="LineNr">299 </span><span class="Normal">case</span> <span class="Constant">0x8b</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r32 to r/m32</span>
-<span id="L300" class="LineNr">300 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L301" class="LineNr">301 </span>  <span class="Normal">uint8_t</span> reg1 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L302" class="LineNr">302 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy effective address to <a href='010core.cc.html#L15'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L302" class="LineNr">302 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy effective address to <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L303" class="LineNr">303 </span>  <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L304" class="LineNr">304 </span>  Reg[reg1]<span class="Delimiter">.</span>i = *arg2<span class="Delimiter">;</span>
-<span id="L305" class="LineNr">305 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L228'>HEXWORD</a> &lt;&lt; *arg2 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L305" class="LineNr">305 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; *arg2 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L306" class="LineNr">306 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L307" class="LineNr">307 </span><span class="Delimiter">}</span>
 <span id="L308" class="LineNr">308 </span>
@@ -389,14 +389,14 @@ if ('onhashchange' in window) {
 <span id="L324" class="LineNr">324 </span>
 <span id="L325" class="LineNr">325 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L326" class="LineNr">326 </span><span class="Normal">case</span> <span class="Constant">0xff</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump to r/m32</span>
-<span id="L327" class="LineNr">327 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
+<span id="L327" class="LineNr">327 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L328" class="LineNr">328 </span>  <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
 <span id="L329" class="LineNr">329 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L330" class="LineNr">330 </span>  <span class="Normal">case</span> <span class="Constant">4</span>:
 <span id="L331" class="LineNr">331 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump to effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L332" class="LineNr">332 </span>  <span class="Conceal">¦</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L333" class="LineNr">333 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L21'>EIP</a> = *arg2<span class="Delimiter">;</span>
-<span id="L334" class="LineNr">334 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L228'>HEXWORD</a> &lt;&lt; <a href='010core.cc.html#L21'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L333" class="LineNr">333 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> = *arg2<span class="Delimiter">;</span>
+<span id="L334" class="LineNr">334 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; <a href='010core.cc.html#L23'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L335" class="LineNr">335 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L336" class="LineNr">336 </span>  <span class="Comment">// End Op ff Subops</span>
 <span id="L337" class="LineNr">337 </span>  <span class="Delimiter">}</span>
diff --git a/html/subx/013immediate_addressing.cc.html b/html/subx/013immediate_addressing.cc.html
index 7f34dc57..bde49732 100644
--- a/html/subx/013immediate_addressing.cc.html
+++ b/html/subx/013immediate_addressing.cc.html
@@ -68,26 +68,26 @@ if ('onhashchange' in window) {
 <span id="L4" class="LineNr">  4 </span><span class="Special">% Reg[3].i = 1;</span>
 <span id="L5" class="LineNr">  5 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L6" class="LineNr">  6 </span>  <span class="Constant">81</span>  c3                          0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to EBX (reg 3)</span>
-<span id="L7" class="LineNr">  7 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L8" class="LineNr">  8 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L7" class="LineNr">  7 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
+<span id="L8" class="LineNr">  8 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L9" class="LineNr">  9 </span><span class="traceContains">+run: subop add</span>
 <span id="L10" class="LineNr"> 10 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span>
 <span id="L11" class="LineNr"> 11 </span>
 <span id="L12" class="LineNr"> 12 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L13" class="LineNr"> 13 </span><span class="Normal">case</span> <span class="Constant">0x81</span>: <span class="Delimiter">{</span>  <span class="Comment">// combine imm32 with r/m32</span>
-<span id="L14" class="LineNr"> 14 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
-<span id="L15" class="LineNr"> 15 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L217'>imm32</a><span class="Delimiter">();</span>
-<span id="L16" class="LineNr"> 16 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;combine <a href='010core.cc.html#L217'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L14" class="LineNr"> 14 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L15" class="LineNr"> 15 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
+<span id="L16" class="LineNr"> 16 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;combine <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L17" class="LineNr"> 17 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L18" class="LineNr"> 18 </span>  <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
 <span id="L19" class="LineNr"> 19 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Normal">case</span> <span class="Constant">0</span>:
 <span id="L21" class="LineNr"> 21 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop add&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L41'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L22" class="LineNr"> 22 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L43'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Comment">// End Op 81 Subops</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Normal">default</span>:
-<span id="L26" class="LineNr"> 26 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after 81: &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L26" class="LineNr"> 26 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after 81: &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L27" class="LineNr"> 27 </span>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Delimiter">}</span>
 <span id="L29" class="LineNr"> 29 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -100,7 +100,7 @@ if ('onhashchange' in window) {
 <span id="L36" class="LineNr"> 36 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 1);</span>
 <span id="L37" class="LineNr"> 37 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L38" class="LineNr"> 38 </span>  <span class="Constant">81</span>  <span class="PreProc">0</span><span class="Constant">3</span>                          0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to *EBX (reg 3)</span>
-<span id="L39" class="LineNr"> 39 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a with effective address</span>
+<span id="L39" class="LineNr"> 39 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
 <span id="L40" class="LineNr"> 40 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
 <span id="L41" class="LineNr"> 41 </span><span class="traceContains">+run: subop add</span>
 <span id="L42" class="LineNr"> 42 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span>
@@ -111,14 +111,14 @@ if ('onhashchange' in window) {
 <span id="L47" class="LineNr"> 47 </span><span class="Special">% Reg[EAX].i = 0x0d0c0baa;</span>
 <span id="L48" class="LineNr"> 48 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L49" class="LineNr"> 49 </span>  2d                              0a 0b 0c 0d  <span class="Comment"># subtract 0x0d0c0b0a from EAX (reg 0)</span>
-<span id="L50" class="LineNr"> 50 </span><span class="traceContains">+run: subtract <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a from <a href='010core.cc.html#L15'>reg</a> <a href='010core.cc.html#L5'>EAX</a></span>
+<span id="L50" class="LineNr"> 50 </span><span class="traceContains">+run: subtract <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a from <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a></span>
 <span id="L51" class="LineNr"> 51 </span><span class="traceContains">+run: storing 0x000000a0</span>
 <span id="L52" class="LineNr"> 52 </span>
 <span id="L53" class="LineNr"> 53 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L54" class="LineNr"> 54 </span><span class="Normal">case</span> <span class="Constant">0x2d</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract imm32 from EAX</span>
-<span id="L55" class="LineNr"> 55 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L217'>imm32</a><span class="Delimiter">();</span>
-<span id="L56" class="LineNr"> 56 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract <a href='010core.cc.html#L217'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from <a href='010core.cc.html#L15'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L57" class="LineNr"> 57 </span>  <a href='010core.cc.html#L41'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
+<span id="L56" class="LineNr"> 56 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from <a href='010core.cc.html#L17'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L57" class="LineNr"> 57 </span>  <a href='010core.cc.html#L43'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L58" class="LineNr"> 58 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L59" class="LineNr"> 59 </span><span class="Delimiter">}</span>
 <span id="L60" class="LineNr"> 60 </span>
@@ -129,7 +129,7 @@ if ('onhashchange' in window) {
 <span id="L65" class="LineNr"> 65 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 10);</span>
 <span id="L66" class="LineNr"> 66 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L67" class="LineNr"> 67 </span>  <span class="Constant">81</span>  2b                          <span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># subtract 1 from *EBX (reg 3)</span>
-<span id="L68" class="LineNr"> 68 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L217'>imm32</a> 0x00000001 with effective address</span>
+<span id="L68" class="LineNr"> 68 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x00000001 with effective address</span>
 <span id="L69" class="LineNr"> 69 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
 <span id="L70" class="LineNr"> 70 </span><span class="traceContains">+run: subop subtract</span>
 <span id="L71" class="LineNr"> 71 </span><span class="traceContains">+run: storing 0x00000009</span>
@@ -140,15 +140,15 @@ if ('onhashchange' in window) {
 <span id="L76" class="LineNr"> 76 </span><span class="Special">% Reg[3].i = 10;</span>
 <span id="L77" class="LineNr"> 77 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L78" class="LineNr"> 78 </span>  <span class="Constant">81</span>  eb                          <span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># subtract 1 from EBX (reg 3)</span>
-<span id="L79" class="LineNr"> 79 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L217'>imm32</a> 0x00000001 with effective address</span>
-<span id="L80" class="LineNr"> 80 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L79" class="LineNr"> 79 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x00000001 with effective address</span>
+<span id="L80" class="LineNr"> 80 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L81" class="LineNr"> 81 </span><span class="traceContains">+run: subop subtract</span>
 <span id="L82" class="LineNr"> 82 </span><span class="traceContains">+run: storing 0x00000009</span>
 <span id="L83" class="LineNr"> 83 </span>
 <span id="L84" class="LineNr"> 84 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L85" class="LineNr"> 85 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>
 <span id="L86" class="LineNr"> 86 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop subtract&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L87" class="LineNr"> 87 </span>  <a href='010core.cc.html#L41'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L87" class="LineNr"> 87 </span>  <a href='010core.cc.html#L43'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L88" class="LineNr"> 88 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span>
@@ -158,14 +158,14 @@ if ('onhashchange' in window) {
 <span id="L94" class="LineNr"> 94 </span><span class="Special">% Reg[EAX].i = 0xff;</span>
 <span id="L95" class="LineNr"> 95 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Constant">25</span>                              0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EAX (reg 0)</span>
-<span id="L97" class="LineNr"> 97 </span><span class="traceContains">+run: and <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a with <a href='010core.cc.html#L15'>reg</a> <a href='010core.cc.html#L5'>EAX</a></span>
+<span id="L97" class="LineNr"> 97 </span><span class="traceContains">+run: and <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a></span>
 <span id="L98" class="LineNr"> 98 </span><span class="traceContains">+run: storing 0x0000000a</span>
 <span id="L99" class="LineNr"> 99 </span>
 <span id="L100" class="LineNr">100 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L101" class="LineNr">101 </span><span class="Normal">case</span> <span class="Constant">0x25</span>: <span class="Delimiter">{</span>  <span class="Comment">// and imm32 with EAX</span>
-<span id="L102" class="LineNr">102 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L217'>imm32</a><span class="Delimiter">();</span>
-<span id="L103" class="LineNr">103 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and <a href='010core.cc.html#L217'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with <a href='010core.cc.html#L15'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L104" class="LineNr">104 </span>  <a href='010core.cc.html#L53'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
+<span id="L103" class="LineNr">103 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with <a href='010core.cc.html#L17'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L104" class="LineNr">104 </span>  <a href='010core.cc.html#L55'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L106" class="LineNr">106 </span><span class="Delimiter">}</span>
 <span id="L107" class="LineNr">107 </span>
@@ -176,7 +176,7 @@ if ('onhashchange' in window) {
 <span id="L112" class="LineNr">112 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x000000ff);</span>
 <span id="L113" class="LineNr">113 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L114" class="LineNr">114 </span>  <span class="Constant">81</span>  <span class="Constant">23</span>                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with *EBX (reg 3)</span>
-<span id="L115" class="LineNr">115 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a with effective address</span>
+<span id="L115" class="LineNr">115 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
 <span id="L116" class="LineNr">116 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
 <span id="L117" class="LineNr">117 </span><span class="traceContains">+run: subop and</span>
 <span id="L118" class="LineNr">118 </span><span class="traceContains">+run: storing 0x0000000a</span>
@@ -187,15 +187,15 @@ if ('onhashchange' in window) {
 <span id="L123" class="LineNr">123 </span><span class="Special">% Reg[3].i = 0xff;</span>
 <span id="L124" class="LineNr">124 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L125" class="LineNr">125 </span>  <span class="Constant">81</span>  e3                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EBX (reg 3)</span>
-<span id="L126" class="LineNr">126 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L127" class="LineNr">127 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L126" class="LineNr">126 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
+<span id="L127" class="LineNr">127 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L128" class="LineNr">128 </span><span class="traceContains">+run: subop and</span>
 <span id="L129" class="LineNr">129 </span><span class="traceContains">+run: storing 0x0000000a</span>
 <span id="L130" class="LineNr">130 </span>
 <span id="L131" class="LineNr">131 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L132" class="LineNr">132 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>
 <span id="L133" class="LineNr">133 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop and&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L134" class="LineNr">134 </span>  <a href='010core.cc.html#L53'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L134" class="LineNr">134 </span>  <a href='010core.cc.html#L55'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L135" class="LineNr">135 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L136" class="LineNr">136 </span><span class="Delimiter">}</span>
 <span id="L137" class="LineNr">137 </span>
@@ -205,14 +205,14 @@ if ('onhashchange' in window) {
 <span id="L141" class="LineNr">141 </span><span class="Special">% Reg[EAX].i = 0xd0c0b0a0;</span>
 <span id="L142" class="LineNr">142 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L143" class="LineNr">143 </span>  0d                              0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EAX (reg 0)</span>
-<span id="L144" class="LineNr">144 </span><span class="traceContains">+run: or <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a with <a href='010core.cc.html#L15'>reg</a> <a href='010core.cc.html#L5'>EAX</a></span>
+<span id="L144" class="LineNr">144 </span><span class="traceContains">+run: or <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a></span>
 <span id="L145" class="LineNr">145 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
 <span id="L146" class="LineNr">146 </span>
 <span id="L147" class="LineNr">147 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L148" class="LineNr">148 </span><span class="Normal">case</span> <span class="Constant">0x0d</span>: <span class="Delimiter">{</span>  <span class="Comment">// or imm32 with EAX</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L217'>imm32</a><span class="Delimiter">();</span>
-<span id="L150" class="LineNr">150 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or <a href='010core.cc.html#L217'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with <a href='010core.cc.html#L15'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L151" class="LineNr">151 </span>  <a href='010core.cc.html#L53'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
+<span id="L150" class="LineNr">150 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with <a href='010core.cc.html#L17'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L151" class="LineNr">151 </span>  <a href='010core.cc.html#L55'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L152" class="LineNr">152 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L153" class="LineNr">153 </span><span class="Delimiter">}</span>
 <span id="L154" class="LineNr">154 </span>
@@ -223,7 +223,7 @@ if ('onhashchange' in window) {
 <span id="L159" class="LineNr">159 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0xd0c0b0a0);</span>
 <span id="L160" class="LineNr">160 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L161" class="LineNr">161 </span>  <span class="Constant">81</span>  0b                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with *EBX (reg 3)</span>
-<span id="L162" class="LineNr">162 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a with effective address</span>
+<span id="L162" class="LineNr">162 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
 <span id="L163" class="LineNr">163 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
 <span id="L164" class="LineNr">164 </span><span class="traceContains">+run: subop or</span>
 <span id="L165" class="LineNr">165 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
@@ -234,15 +234,15 @@ if ('onhashchange' in window) {
 <span id="L170" class="LineNr">170 </span><span class="Special">% Reg[3].i = 0xd0c0b0a0;</span>
 <span id="L171" class="LineNr">171 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L172" class="LineNr">172 </span>  <span class="Constant">81</span>  cb                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EBX (reg 3)</span>
-<span id="L173" class="LineNr">173 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L174" class="LineNr">174 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L173" class="LineNr">173 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
+<span id="L174" class="LineNr">174 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L175" class="LineNr">175 </span><span class="traceContains">+run: subop or</span>
 <span id="L176" class="LineNr">176 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
 <span id="L177" class="LineNr">177 </span>
 <span id="L178" class="LineNr">178 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L179" class="LineNr">179 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>
 <span id="L180" class="LineNr">180 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop or&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L181" class="LineNr">181 </span>  <a href='010core.cc.html#L53'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L181" class="LineNr">181 </span>  <a href='010core.cc.html#L55'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L182" class="LineNr">182 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span>
 <span id="L184" class="LineNr">184 </span>
@@ -252,14 +252,14 @@ if ('onhashchange' in window) {
 <span id="L188" class="LineNr">188 </span><span class="Special">% Reg[EAX].i = 0xddccb0a0;</span>
 <span id="L189" class="LineNr">189 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L190" class="LineNr">190 </span>  <span class="Constant">35</span>                              0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EAX (reg 0)</span>
-<span id="L191" class="LineNr">191 </span><span class="traceContains">+run: xor <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a with <a href='010core.cc.html#L15'>reg</a> <a href='010core.cc.html#L5'>EAX</a></span>
+<span id="L191" class="LineNr">191 </span><span class="traceContains">+run: xor <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a></span>
 <span id="L192" class="LineNr">192 </span><span class="traceContains">+run: storing 0xd0c0bbaa</span>
 <span id="L193" class="LineNr">193 </span>
 <span id="L194" class="LineNr">194 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L195" class="LineNr">195 </span><span class="Normal">case</span> <span class="Constant">0x35</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor imm32 with EAX</span>
-<span id="L196" class="LineNr">196 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L217'>imm32</a><span class="Delimiter">();</span>
-<span id="L197" class="LineNr">197 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor <a href='010core.cc.html#L217'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with <a href='010core.cc.html#L15'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L198" class="LineNr">198 </span>  <a href='010core.cc.html#L53'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L196" class="LineNr">196 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
+<span id="L197" class="LineNr">197 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with <a href='010core.cc.html#L17'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L198" class="LineNr">198 </span>  <a href='010core.cc.html#L55'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L199" class="LineNr">199 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L200" class="LineNr">200 </span><span class="Delimiter">}</span>
 <span id="L201" class="LineNr">201 </span>
@@ -270,7 +270,7 @@ if ('onhashchange' in window) {
 <span id="L206" class="LineNr">206 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0xd0c0b0a0);</span>
 <span id="L207" class="LineNr">207 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L208" class="LineNr">208 </span>  <span class="Constant">81</span>  <span class="Constant">33</span>                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with *EBX (reg 3)</span>
-<span id="L209" class="LineNr">209 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a with effective address</span>
+<span id="L209" class="LineNr">209 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
 <span id="L210" class="LineNr">210 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
 <span id="L211" class="LineNr">211 </span><span class="traceContains">+run: subop xor</span>
 <span id="L212" class="LineNr">212 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
@@ -281,15 +281,15 @@ if ('onhashchange' in window) {
 <span id="L217" class="LineNr">217 </span><span class="Special">% Reg[3].i = 0xd0c0b0a0;</span>
 <span id="L218" class="LineNr">218 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L219" class="LineNr">219 </span>  <span class="Constant">81</span>  f3                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EBX (reg 3)</span>
-<span id="L220" class="LineNr">220 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L221" class="LineNr">221 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L220" class="LineNr">220 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
+<span id="L221" class="LineNr">221 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L222" class="LineNr">222 </span><span class="traceContains">+run: subop xor</span>
 <span id="L223" class="LineNr">223 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
 <span id="L224" class="LineNr">224 </span>
 <span id="L225" class="LineNr">225 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L226" class="LineNr">226 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>
 <span id="L227" class="LineNr">227 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop xor&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L228" class="LineNr">228 </span>  <a href='010core.cc.html#L53'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L228" class="LineNr">228 </span>  <a href='010core.cc.html#L55'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L229" class="LineNr">229 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L230" class="LineNr">230 </span><span class="Delimiter">}</span>
 <span id="L231" class="LineNr">231 </span>
@@ -299,20 +299,20 @@ if ('onhashchange' in window) {
 <span id="L235" class="LineNr">235 </span><span class="Special">% Reg[0].i = 0x0d0c0b0a;</span>
 <span id="L236" class="LineNr">236 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L237" class="LineNr">237 </span>  3d                              <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with EAX (reg 0)</span>
-<span id="L238" class="LineNr">238 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L15'>reg</a> <a href='010core.cc.html#L5'>EAX</a> and <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b07</span>
+<span id="L238" class="LineNr">238 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a> and <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b07</span>
 <span id="L239" class="LineNr">239 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
 <span id="L240" class="LineNr">240 </span>
 <span id="L241" class="LineNr">241 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L242" class="LineNr">242 </span><span class="Normal">case</span> <span class="Constant">0x3d</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract imm32 from EAX</span>
 <span id="L243" class="LineNr">243 </span>  <span class="Normal">int32_t</span> arg1 = Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L244" class="LineNr">244 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L217'>imm32</a><span class="Delimiter">();</span>
-<span id="L245" class="LineNr">245 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare <a href='010core.cc.html#L15'>reg</a> <a href='010core.cc.html#L5'>EAX</a> and <a href='010core.cc.html#L217'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L244" class="LineNr">244 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
+<span id="L245" class="LineNr">245 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a> and <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L246" class="LineNr">246 </span>  <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span>
 <span id="L247" class="LineNr">247 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L248" class="LineNr">248 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L249" class="LineNr">249 </span>  <span class="Normal">int64_t</span> tmp2 = arg1 - arg2<span class="Delimiter">;</span>
-<span id="L250" class="LineNr">250 </span>  <a href='010core.cc.html#L31'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L251" class="LineNr">251 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010core.cc.html#L31'>OF</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L250" class="LineNr">250 </span>  <a href='010core.cc.html#L33'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L251" class="LineNr">251 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010core.cc.html#L33'>OF</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L252" class="LineNr">252 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L253" class="LineNr">253 </span><span class="Delimiter">}</span>
 <span id="L254" class="LineNr">254 </span>
@@ -320,14 +320,14 @@ if ('onhashchange' in window) {
 <span id="L256" class="LineNr">256 </span><span class="Special">% Reg[0].i = 0x0d0c0b07;</span>
 <span id="L257" class="LineNr">257 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L258" class="LineNr">258 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX (reg 0)</span>
-<span id="L259" class="LineNr">259 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L15'>reg</a> <a href='010core.cc.html#L5'>EAX</a> and <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a</span>
+<span id="L259" class="LineNr">259 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a> and <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a</span>
 <span id="L260" class="LineNr">260 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
 <span id="L261" class="LineNr">261 </span>
 <span id="L262" class="LineNr">262 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_equal)</span>
 <span id="L263" class="LineNr">263 </span><span class="Special">% Reg[0].i = 0x0d0c0b0a;</span>
 <span id="L264" class="LineNr">264 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L265" class="LineNr">265 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX (reg 0)</span>
-<span id="L266" class="LineNr">266 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L15'>reg</a> <a href='010core.cc.html#L5'>EAX</a> and <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a</span>
+<span id="L266" class="LineNr">266 </span><span class="traceContains">+run: compare <a href='010core.cc.html#L17'>reg</a> <a href='010core.cc.html#L7'>EAX</a> and <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a</span>
 <span id="L267" class="LineNr">267 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
 <span id="L268" class="LineNr">268 </span>
 <span id="L269" class="LineNr">269 </span><span class="Comment">//:</span>
@@ -336,8 +336,8 @@ if ('onhashchange' in window) {
 <span id="L272" class="LineNr">272 </span><span class="Special">% Reg[3].i = 0x0d0c0b0a;</span>
 <span id="L273" class="LineNr">273 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L274" class="LineNr">274 </span>  <span class="Constant">81</span>  fb                          <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with EBX (reg 3)</span>
-<span id="L275" class="LineNr">275 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b07 with effective address</span>
-<span id="L276" class="LineNr">276 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L275" class="LineNr">275 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b07 with effective address</span>
+<span id="L276" class="LineNr">276 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L277" class="LineNr">277 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
 <span id="L278" class="LineNr">278 </span>
 <span id="L279" class="LineNr">279 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
@@ -347,8 +347,8 @@ if ('onhashchange' in window) {
 <span id="L283" class="LineNr">283 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L284" class="LineNr">284 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L285" class="LineNr">285 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L286" class="LineNr">286 </span>  <a href='010core.cc.html#L31'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L287" class="LineNr">287 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010core.cc.html#L31'>OF</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L286" class="LineNr">286 </span>  <a href='010core.cc.html#L33'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L287" class="LineNr">287 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010core.cc.html#L33'>OF</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L288" class="LineNr">288 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L289" class="LineNr">289 </span><span class="Delimiter">}</span>
 <span id="L290" class="LineNr">290 </span>
@@ -356,16 +356,16 @@ if ('onhashchange' in window) {
 <span id="L292" class="LineNr">292 </span><span class="Special">% Reg[3].i = 0x0d0c0b07;</span>
 <span id="L293" class="LineNr">293 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L294" class="LineNr">294 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX (reg 3)</span>
-<span id="L295" class="LineNr">295 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L296" class="LineNr">296 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L295" class="LineNr">295 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
+<span id="L296" class="LineNr">296 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L297" class="LineNr">297 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
 <span id="L298" class="LineNr">298 </span>
 <span id="L299" class="LineNr">299 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_equal)</span>
 <span id="L300" class="LineNr">300 </span><span class="Special">% Reg[3].i = 0x0d0c0b0a;</span>
 <span id="L301" class="LineNr">301 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L302" class="LineNr">302 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX (reg 3)</span>
-<span id="L303" class="LineNr">303 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a with effective address</span>
-<span id="L304" class="LineNr">304 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L303" class="LineNr">303 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
+<span id="L304" class="LineNr">304 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L305" class="LineNr">305 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
 <span id="L306" class="LineNr">306 </span>
 <span id="L307" class="LineNr">307 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_greater)</span>
@@ -373,7 +373,7 @@ if ('onhashchange' in window) {
 <span id="L309" class="LineNr">309 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0d0c0b0a);</span>
 <span id="L310" class="LineNr">310 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L311" class="LineNr">311 </span>  <span class="Constant">81</span>  3b                          <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with *EBX (reg 3)</span>
-<span id="L312" class="LineNr">312 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b07 with effective address</span>
+<span id="L312" class="LineNr">312 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b07 with effective address</span>
 <span id="L313" class="LineNr">313 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
 <span id="L314" class="LineNr">314 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
 <span id="L315" class="LineNr">315 </span>
@@ -382,7 +382,7 @@ if ('onhashchange' in window) {
 <span id="L318" class="LineNr">318 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0d0c0b07);</span>
 <span id="L319" class="LineNr">319 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L320" class="LineNr">320 </span>  <span class="Constant">81</span>  3b                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with *EBX (reg 3)</span>
-<span id="L321" class="LineNr">321 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a with effective address</span>
+<span id="L321" class="LineNr">321 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
 <span id="L322" class="LineNr">322 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
 <span id="L323" class="LineNr">323 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
 <span id="L324" class="LineNr">324 </span>
@@ -392,7 +392,7 @@ if ('onhashchange' in window) {
 <span id="L328" class="LineNr">328 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0d0c0b0a);</span>
 <span id="L329" class="LineNr">329 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L330" class="LineNr">330 </span>  <span class="Constant">81</span>  3b                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with *EBX (reg 3)</span>
-<span id="L331" class="LineNr">331 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a with effective address</span>
+<span id="L331" class="LineNr">331 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a with effective address</span>
 <span id="L332" class="LineNr">332 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
 <span id="L333" class="LineNr">333 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
 <span id="L334" class="LineNr">334 </span>
@@ -401,14 +401,14 @@ if ('onhashchange' in window) {
 <span id="L337" class="LineNr">337 </span><span class="Delimiter">:(scenario copy_imm32_to_r32)</span>
 <span id="L338" class="LineNr">338 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L339" class="LineNr">339 </span>  b8  <span class="PreProc">0</span><span class="Constant">3</span>                          0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to EBX (reg 3)</span>
-<span id="L340" class="LineNr">340 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a to <a href='010core.cc.html#L15'>reg</a> 3</span>
+<span id="L340" class="LineNr">340 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a to <a href='010core.cc.html#L17'>reg</a> 3</span>
 <span id="L341" class="LineNr">341 </span>
 <span id="L342" class="LineNr">342 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L343" class="LineNr">343 </span><span class="Normal">case</span> <span class="Constant">0xb8</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
-<span id="L344" class="LineNr">344 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
-<span id="L345" class="LineNr">345 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L217'>imm32</a><span class="Delimiter">();</span>
+<span id="L344" class="LineNr">344 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L345" class="LineNr">345 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
 <span id="L346" class="LineNr">346 </span>  <span class="Normal">uint8_t</span> reg1 = modrm&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// ignore mod bits</span>
-<span id="L347" class="LineNr">347 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='010core.cc.html#L217'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to <a href='010core.cc.html#L15'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L347" class="LineNr">347 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L348" class="LineNr">348 </span>  Reg[reg1]<span class="Delimiter">.</span>i = arg2<span class="Delimiter">;</span>
 <span id="L349" class="LineNr">349 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L350" class="LineNr">350 </span><span class="Delimiter">}</span>
@@ -418,14 +418,14 @@ if ('onhashchange' in window) {
 <span id="L354" class="LineNr">354 </span><span class="Special">% Reg[3].i = 0x60;</span>
 <span id="L355" class="LineNr">355 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L356" class="LineNr">356 </span>  c7  <span class="PreProc">0</span><span class="Constant">3</span>                          0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to *EBX (reg 3)</span>
-<span id="L357" class="LineNr">357 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L217'>imm32</a> 0x0d0c0b0a to effective address</span>
+<span id="L357" class="LineNr">357 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a to effective address</span>
 <span id="L358" class="LineNr">358 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
 <span id="L359" class="LineNr">359 </span>
 <span id="L360" class="LineNr">360 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L361" class="LineNr">361 </span><span class="Normal">case</span> <span class="Constant">0xc7</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
-<span id="L362" class="LineNr">362 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
-<span id="L363" class="LineNr">363 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L217'>imm32</a><span class="Delimiter">();</span>
-<span id="L364" class="LineNr">364 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='010core.cc.html#L217'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L228'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L362" class="LineNr">362 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L363" class="LineNr">363 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
+<span id="L364" class="LineNr">364 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L365" class="LineNr">365 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L366" class="LineNr">366 </span>  *arg1 = arg2<span class="Delimiter">;</span>
 <span id="L367" class="LineNr">367 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/subx/014jump_relative.cc.html b/html/subx/014jump_relative.cc.html
index 9722e271..72671ac4 100644
--- a/html/subx/014jump_relative.cc.html
+++ b/html/subx/014jump_relative.cc.html
@@ -78,9 +78,9 @@ if ('onhashchange' in window) {
 <span id="L14" class="LineNr"> 14 </span>
 <span id="L15" class="LineNr"> 15 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L16" class="LineNr"> 16 </span><span class="Normal">case</span> <span class="Constant">0xeb</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8</span>
-<span id="L17" class="LineNr"> 17 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L212'>next</a><span class="Delimiter">());</span>
-<span id="L18" class="LineNr"> 18 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L19" class="LineNr"> 19 </span>  <a href='010core.cc.html#L21'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L17" class="LineNr"> 17 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">());</span>
+<span id="L18" class="LineNr"> 18 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L19" class="LineNr"> 19 </span>  <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L21" class="LineNr"> 21 </span><span class="Delimiter">}</span>
 <span id="L22" class="LineNr"> 22 </span>
@@ -99,10 +99,10 @@ if ('onhashchange' in window) {
 <span id="L35" class="LineNr"> 35 </span>
 <span id="L36" class="LineNr"> 36 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L37" class="LineNr"> 37 </span><span class="Normal">case</span> <span class="Constant">0x74</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if ZF</span>
-<span id="L38" class="LineNr"> 38 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L212'>next</a><span class="Delimiter">());</span>
+<span id="L38" class="LineNr"> 38 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">());</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L40" class="LineNr"> 40 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L41" class="LineNr"> 41 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L21'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L40" class="LineNr"> 40 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L41" class="LineNr"> 41 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L42" class="LineNr"> 42 </span>  <span class="Delimiter">}</span>
 <span id="L43" class="LineNr"> 43 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L44" class="LineNr"> 44 </span><span class="Delimiter">}</span>
@@ -133,10 +133,10 @@ if ('onhashchange' in window) {
 <span id="L69" class="LineNr"> 69 </span>
 <span id="L70" class="LineNr"> 70 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L71" class="LineNr"> 71 </span><span class="Normal">case</span> <span class="Constant">0x75</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 unless ZF</span>
-<span id="L72" class="LineNr"> 72 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L212'>next</a><span class="Delimiter">());</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">());</span>
 <span id="L73" class="LineNr"> 73 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L74" class="LineNr"> 74 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L75" class="LineNr"> 75 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L21'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L75" class="LineNr"> 75 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L76" class="LineNr"> 76 </span>  <span class="Delimiter">}</span>
 <span id="L77" class="LineNr"> 77 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L78" class="LineNr"> 78 </span><span class="Delimiter">}</span>
@@ -157,7 +157,7 @@ if ('onhashchange' in window) {
 <span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(scenario jg_rel8_success)</span>
 <span id="L94" class="LineNr"> 94 </span><span class="Special">% ZF = false;</span>
 <span id="L95" class="LineNr"> 95 </span><span class="Special">% SF = false;</span>
-<span id="L96" class="LineNr"> 96 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L96" class="LineNr"> 96 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L97" class="LineNr"> 97 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L98" class="LineNr"> 98 </span>  <span class="Constant">7f</span>                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
 <span id="L99" class="LineNr"> 99 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
@@ -169,10 +169,10 @@ if ('onhashchange' in window) {
 <span id="L105" class="LineNr">105 </span>
 <span id="L106" class="LineNr">106 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L107" class="LineNr">107 </span><span class="Normal">case</span> <span class="Constant">0x7f</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if !SF and !ZF</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L212'>next</a><span class="Delimiter">());</span>
-<span id="L109" class="LineNr">109 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF &amp;&amp; SF == <a href='010core.cc.html#L31'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L110" class="LineNr">110 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L111" class="LineNr">111 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L21'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L108" class="LineNr">108 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">());</span>
+<span id="L109" class="LineNr">109 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF &amp;&amp; SF == <a href='010core.cc.html#L33'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L110" class="LineNr">110 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L111" class="LineNr">111 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L112" class="LineNr">112 </span>  <span class="Delimiter">}</span>
 <span id="L113" class="LineNr">113 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L114" class="LineNr">114 </span><span class="Delimiter">}</span>
@@ -180,7 +180,7 @@ if ('onhashchange' in window) {
 <span id="L116" class="LineNr">116 </span><span class="Delimiter">:(scenario jg_rel8_fail)</span>
 <span id="L117" class="LineNr">117 </span><span class="Special">% ZF = false;</span>
 <span id="L118" class="LineNr">118 </span><span class="Special">% SF = true;</span>
-<span id="L119" class="LineNr">119 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L119" class="LineNr">119 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L120" class="LineNr">120 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L121" class="LineNr">121 </span>  <span class="Constant">7f</span>                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
 <span id="L122" class="LineNr">122 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
@@ -194,7 +194,7 @@ if ('onhashchange' in window) {
 <span id="L130" class="LineNr">130 </span>
 <span id="L131" class="LineNr">131 </span><span class="Delimiter">:(scenario jge_rel8_success)</span>
 <span id="L132" class="LineNr">132 </span><span class="Special">% SF = false;</span>
-<span id="L133" class="LineNr">133 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L133" class="LineNr">133 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L134" class="LineNr">134 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L135" class="LineNr">135 </span>  7d                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
 <span id="L136" class="LineNr">136 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
@@ -206,17 +206,17 @@ if ('onhashchange' in window) {
 <span id="L142" class="LineNr">142 </span>
 <span id="L143" class="LineNr">143 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L144" class="LineNr">144 </span><span class="Normal">case</span> <span class="Constant">0x7d</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if !SF</span>
-<span id="L145" class="LineNr">145 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L212'>next</a><span class="Delimiter">());</span>
-<span id="L146" class="LineNr">146 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF == <a href='010core.cc.html#L31'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L147" class="LineNr">147 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L21'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L145" class="LineNr">145 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">());</span>
+<span id="L146" class="LineNr">146 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF == <a href='010core.cc.html#L33'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L147" class="LineNr">147 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L148" class="LineNr">148 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L149" class="LineNr">149 </span>  <span class="Delimiter">}</span>
 <span id="L150" class="LineNr">150 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L151" class="LineNr">151 </span><span class="Delimiter">}</span>
 <span id="L152" class="LineNr">152 </span>
 <span id="L153" class="LineNr">153 </span><span class="Delimiter">:(scenario jge_rel8_fail)</span>
 <span id="L154" class="LineNr">154 </span><span class="Special">% SF = true;</span>
-<span id="L155" class="LineNr">155 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L155" class="LineNr">155 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L156" class="LineNr">156 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L157" class="LineNr">157 </span>  7d                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
 <span id="L158" class="LineNr">158 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
@@ -231,7 +231,7 @@ if ('onhashchange' in window) {
 <span id="L167" class="LineNr">167 </span><span class="Delimiter">:(scenario jl_rel8_success)</span>
 <span id="L168" class="LineNr">168 </span><span class="Special">% ZF = false;</span>
 <span id="L169" class="LineNr">169 </span><span class="Special">% SF = true;</span>
-<span id="L170" class="LineNr">170 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L170" class="LineNr">170 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L171" class="LineNr">171 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L172" class="LineNr">172 </span>  7c                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
 <span id="L173" class="LineNr">173 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
@@ -243,10 +243,10 @@ if ('onhashchange' in window) {
 <span id="L179" class="LineNr">179 </span>
 <span id="L180" class="LineNr">180 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L181" class="LineNr">181 </span><span class="Normal">case</span> <span class="Constant">0x7c</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if SF and !ZF</span>
-<span id="L182" class="LineNr">182 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L212'>next</a><span class="Delimiter">());</span>
-<span id="L183" class="LineNr">183 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF != <a href='010core.cc.html#L31'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L184" class="LineNr">184 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L185" class="LineNr">185 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L21'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L182" class="LineNr">182 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">());</span>
+<span id="L183" class="LineNr">183 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF != <a href='010core.cc.html#L33'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L184" class="LineNr">184 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L185" class="LineNr">185 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L186" class="LineNr">186 </span>  <span class="Delimiter">}</span>
 <span id="L187" class="LineNr">187 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L188" class="LineNr">188 </span><span class="Delimiter">}</span>
@@ -254,7 +254,7 @@ if ('onhashchange' in window) {
 <span id="L190" class="LineNr">190 </span><span class="Delimiter">:(scenario jl_rel8_fail)</span>
 <span id="L191" class="LineNr">191 </span><span class="Special">% ZF = false;</span>
 <span id="L192" class="LineNr">192 </span><span class="Special">% SF = false;</span>
-<span id="L193" class="LineNr">193 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L193" class="LineNr">193 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L194" class="LineNr">194 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L195" class="LineNr">195 </span>  7c                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
 <span id="L196" class="LineNr">196 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
@@ -269,7 +269,7 @@ if ('onhashchange' in window) {
 <span id="L205" class="LineNr">205 </span><span class="Delimiter">:(scenario jle_rel8_equal)</span>
 <span id="L206" class="LineNr">206 </span><span class="Special">% ZF = true;</span>
 <span id="L207" class="LineNr">207 </span><span class="Special">% SF = false;</span>
-<span id="L208" class="LineNr">208 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L208" class="LineNr">208 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L209" class="LineNr">209 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L210" class="LineNr">210 </span>  7e                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
 <span id="L211" class="LineNr">211 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
@@ -282,7 +282,7 @@ if ('onhashchange' in window) {
 <span id="L218" class="LineNr">218 </span><span class="Delimiter">:(scenario jle_rel8_lesser)</span>
 <span id="L219" class="LineNr">219 </span><span class="Special">% ZF = false;</span>
 <span id="L220" class="LineNr">220 </span><span class="Special">% SF = true;</span>
-<span id="L221" class="LineNr">221 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L221" class="LineNr">221 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L222" class="LineNr">222 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L223" class="LineNr">223 </span>  7e                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
 <span id="L224" class="LineNr">224 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
@@ -294,10 +294,10 @@ if ('onhashchange' in window) {
 <span id="L230" class="LineNr">230 </span>
 <span id="L231" class="LineNr">231 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L232" class="LineNr">232 </span><span class="Normal">case</span> <span class="Constant">0x7e</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8 if SF or ZF</span>
-<span id="L233" class="LineNr">233 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L212'>next</a><span class="Delimiter">());</span>
-<span id="L234" class="LineNr">234 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF || SF != <a href='010core.cc.html#L31'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L235" class="LineNr">235 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L236" class="LineNr">236 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L21'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L233" class="LineNr">233 </span>  <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">());</span>
+<span id="L234" class="LineNr">234 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF || SF != <a href='010core.cc.html#L33'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L235" class="LineNr">235 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L236" class="LineNr">236 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L237" class="LineNr">237 </span>  <span class="Delimiter">}</span>
 <span id="L238" class="LineNr">238 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L239" class="LineNr">239 </span><span class="Delimiter">}</span>
@@ -305,7 +305,7 @@ if ('onhashchange' in window) {
 <span id="L241" class="LineNr">241 </span><span class="Delimiter">:(scenario jle_rel8_greater)</span>
 <span id="L242" class="LineNr">242 </span><span class="Special">% ZF = false;</span>
 <span id="L243" class="LineNr">243 </span><span class="Special">% SF = false;</span>
-<span id="L244" class="LineNr">244 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L244" class="LineNr">244 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L245" class="LineNr">245 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L246" class="LineNr">246 </span>  7e                <span class="PreProc">0</span><span class="Constant">5</span>                        <span class="Comment"># skip 1 instruction</span>
 <span id="L247" class="LineNr">247 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
diff --git a/html/subx/015jump_relative.cc.html b/html/subx/015jump_relative.cc.html
index bc90c4a4..329138e1 100644
--- a/html/subx/015jump_relative.cc.html
+++ b/html/subx/015jump_relative.cc.html
@@ -80,13 +80,13 @@ if ('onhashchange' in window) {
 <span id="L16" class="LineNr"> 16 </span><span class="Normal">case</span> <span class="Constant">0xe9</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel8</span>
 <span id="L17" class="LineNr"> 17 </span>  <span class="Normal">int16_t</span> offset = <a href='015jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
 <span id="L18" class="LineNr"> 18 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; offset &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L19" class="LineNr"> 19 </span>  <a href='010core.cc.html#L21'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L19" class="LineNr"> 19 </span>  <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L21" class="LineNr"> 21 </span><span class="Delimiter">}</span>
 <span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(code)</span>
 <span id="L23" class="LineNr"> 23 </span><span class="Normal">int16_t</span> <a href='015jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Normal">int16_t</span> result = <a href='010core.cc.html#L212'>next</a><span class="Delimiter">();</span>
-<span id="L25" class="LineNr"> 25 </span>  result |= <span class="Delimiter">(</span><a href='010core.cc.html#L212'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="Normal">int16_t</span> result = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L25" class="LineNr"> 25 </span>  result |= <span class="Delimiter">(</span><a href='010core.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
 <span id="L26" class="LineNr"> 26 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L27" class="LineNr"> 27 </span><span class="Delimiter">}</span>
 <span id="L28" class="LineNr"> 28 </span>
@@ -107,8 +107,8 @@ if ('onhashchange' in window) {
 <span id="L43" class="LineNr"> 43 </span><span class="Normal">case</span> <span class="Constant">0x84</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 if ZF</span>
 <span id="L44" class="LineNr"> 44 </span>  <span class="Normal">int8_t</span> offset = <a href='015jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L46" class="LineNr"> 46 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L47" class="LineNr"> 47 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L21'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L46" class="LineNr"> 46 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L47" class="LineNr"> 47 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L48" class="LineNr"> 48 </span>  <span class="Delimiter">}</span>
 <span id="L49" class="LineNr"> 49 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L50" class="LineNr"> 50 </span><span class="Delimiter">}</span>
@@ -141,8 +141,8 @@ if ('onhashchange' in window) {
 <span id="L77" class="LineNr"> 77 </span><span class="Normal">case</span> <span class="Constant">0x85</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 unless ZF</span>
 <span id="L78" class="LineNr"> 78 </span>  <span class="Normal">int8_t</span> offset = <a href='015jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
 <span id="L79" class="LineNr"> 79 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L81" class="LineNr"> 81 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L21'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L82" class="LineNr"> 82 </span>  <span class="Delimiter">}</span>
 <span id="L83" class="LineNr"> 83 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L84" class="LineNr"> 84 </span><span class="Delimiter">}</span>
@@ -163,7 +163,7 @@ if ('onhashchange' in window) {
 <span id="L99" class="LineNr"> 99 </span><span class="Delimiter">:(scenario jg_rel16_success)</span>
 <span id="L100" class="LineNr">100 </span><span class="Special">% ZF = false;</span>
 <span id="L101" class="LineNr">101 </span><span class="Special">% SF = false;</span>
-<span id="L102" class="LineNr">102 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L102" class="LineNr">102 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L103" class="LineNr">103 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L104" class="LineNr">104 </span>  <span class="Constant">0f</span> <span class="Constant">8f</span>             <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
 <span id="L105" class="LineNr">105 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
@@ -176,9 +176,9 @@ if ('onhashchange' in window) {
 <span id="L112" class="LineNr">112 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
 <span id="L113" class="LineNr">113 </span><span class="Normal">case</span> <span class="Constant">0x8f</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 if !SF and !ZF</span>
 <span id="L114" class="LineNr">114 </span>  <span class="Normal">int8_t</span> offset = <a href='015jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
-<span id="L115" class="LineNr">115 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF &amp;&amp; SF == <a href='010core.cc.html#L31'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L116" class="LineNr">116 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L117" class="LineNr">117 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L21'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L115" class="LineNr">115 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF &amp;&amp; SF == <a href='010core.cc.html#L33'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L116" class="LineNr">116 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L117" class="LineNr">117 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L118" class="LineNr">118 </span>  <span class="Delimiter">}</span>
 <span id="L119" class="LineNr">119 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L120" class="LineNr">120 </span><span class="Delimiter">}</span>
@@ -186,7 +186,7 @@ if ('onhashchange' in window) {
 <span id="L122" class="LineNr">122 </span><span class="Delimiter">:(scenario jg_rel16_fail)</span>
 <span id="L123" class="LineNr">123 </span><span class="Special">% ZF = false;</span>
 <span id="L124" class="LineNr">124 </span><span class="Special">% SF = true;</span>
-<span id="L125" class="LineNr">125 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L125" class="LineNr">125 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L126" class="LineNr">126 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L127" class="LineNr">127 </span>  <span class="Constant">0f</span> <span class="Constant">8f</span>             <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
 <span id="L128" class="LineNr">128 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
@@ -200,7 +200,7 @@ if ('onhashchange' in window) {
 <span id="L136" class="LineNr">136 </span>
 <span id="L137" class="LineNr">137 </span><span class="Delimiter">:(scenario jge_rel16_success)</span>
 <span id="L138" class="LineNr">138 </span><span class="Special">% SF = false;</span>
-<span id="L139" class="LineNr">139 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L139" class="LineNr">139 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L140" class="LineNr">140 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L141" class="LineNr">141 </span>  <span class="Constant">0f</span> 8d             <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
 <span id="L142" class="LineNr">142 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
@@ -213,16 +213,16 @@ if ('onhashchange' in window) {
 <span id="L149" class="LineNr">149 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
 <span id="L150" class="LineNr">150 </span><span class="Normal">case</span> <span class="Constant">0x8d</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 if !SF</span>
 <span id="L151" class="LineNr">151 </span>  <span class="Normal">int8_t</span> offset = <a href='015jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
-<span id="L152" class="LineNr">152 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF == <a href='010core.cc.html#L31'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L153" class="LineNr">153 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L21'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L152" class="LineNr">152 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF == <a href='010core.cc.html#L33'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L153" class="LineNr">153 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L155" class="LineNr">155 </span>  <span class="Delimiter">}</span>
 <span id="L156" class="LineNr">156 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L157" class="LineNr">157 </span><span class="Delimiter">}</span>
 <span id="L158" class="LineNr">158 </span>
 <span id="L159" class="LineNr">159 </span><span class="Delimiter">:(scenario jge_rel16_fail)</span>
 <span id="L160" class="LineNr">160 </span><span class="Special">% SF = true;</span>
-<span id="L161" class="LineNr">161 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L161" class="LineNr">161 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L162" class="LineNr">162 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L163" class="LineNr">163 </span>  <span class="Constant">0f</span> 8d             <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
 <span id="L164" class="LineNr">164 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
@@ -237,7 +237,7 @@ if ('onhashchange' in window) {
 <span id="L173" class="LineNr">173 </span><span class="Delimiter">:(scenario jl_rel16_success)</span>
 <span id="L174" class="LineNr">174 </span><span class="Special">% ZF = false;</span>
 <span id="L175" class="LineNr">175 </span><span class="Special">% SF = true;</span>
-<span id="L176" class="LineNr">176 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L176" class="LineNr">176 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L177" class="LineNr">177 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L178" class="LineNr">178 </span>  <span class="Constant">0f</span> 8c             <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
 <span id="L179" class="LineNr">179 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
@@ -250,9 +250,9 @@ if ('onhashchange' in window) {
 <span id="L186" class="LineNr">186 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
 <span id="L187" class="LineNr">187 </span><span class="Normal">case</span> <span class="Constant">0x8c</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 if SF and !ZF</span>
 <span id="L188" class="LineNr">188 </span>  <span class="Normal">int8_t</span> offset = <a href='015jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
-<span id="L189" class="LineNr">189 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF != <a href='010core.cc.html#L31'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L190" class="LineNr">190 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L191" class="LineNr">191 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L21'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L189" class="LineNr">189 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF != <a href='010core.cc.html#L33'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L190" class="LineNr">190 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L191" class="LineNr">191 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L192" class="LineNr">192 </span>  <span class="Delimiter">}</span>
 <span id="L193" class="LineNr">193 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L194" class="LineNr">194 </span><span class="Delimiter">}</span>
@@ -260,7 +260,7 @@ if ('onhashchange' in window) {
 <span id="L196" class="LineNr">196 </span><span class="Delimiter">:(scenario jl_rel16_fail)</span>
 <span id="L197" class="LineNr">197 </span><span class="Special">% ZF = false;</span>
 <span id="L198" class="LineNr">198 </span><span class="Special">% SF = false;</span>
-<span id="L199" class="LineNr">199 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L199" class="LineNr">199 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L200" class="LineNr">200 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L201" class="LineNr">201 </span>  <span class="Constant">0f</span> 8c             <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
 <span id="L202" class="LineNr">202 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
@@ -275,7 +275,7 @@ if ('onhashchange' in window) {
 <span id="L211" class="LineNr">211 </span><span class="Delimiter">:(scenario jle_rel16_equal)</span>
 <span id="L212" class="LineNr">212 </span><span class="Special">% ZF = true;</span>
 <span id="L213" class="LineNr">213 </span><span class="Special">% SF = false;</span>
-<span id="L214" class="LineNr">214 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L214" class="LineNr">214 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L215" class="LineNr">215 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L216" class="LineNr">216 </span>  <span class="Constant">0f</span> 8e             <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
 <span id="L217" class="LineNr">217 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
@@ -288,7 +288,7 @@ if ('onhashchange' in window) {
 <span id="L224" class="LineNr">224 </span><span class="Delimiter">:(scenario jle_rel16_lesser)</span>
 <span id="L225" class="LineNr">225 </span><span class="Special">% ZF = false;</span>
 <span id="L226" class="LineNr">226 </span><span class="Special">% SF = true;</span>
-<span id="L227" class="LineNr">227 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L227" class="LineNr">227 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L228" class="LineNr">228 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L229" class="LineNr">229 </span>  <span class="Constant">0f</span> 8e             <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
 <span id="L230" class="LineNr">230 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
@@ -301,9 +301,9 @@ if ('onhashchange' in window) {
 <span id="L237" class="LineNr">237 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
 <span id="L238" class="LineNr">238 </span><span class="Normal">case</span> <span class="Constant">0x8e</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 if SF or ZF</span>
 <span id="L239" class="LineNr">239 </span>  <span class="Normal">int8_t</span> offset = <a href='015jump_relative.cc.html#L23'>imm16</a><span class="Delimiter">();</span>
-<span id="L240" class="LineNr">240 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF || SF != <a href='010core.cc.html#L31'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L241" class="LineNr">241 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L242" class="LineNr">242 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L21'>EIP</a> += offset<span class="Delimiter">;</span>
+<span id="L240" class="LineNr">240 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF || SF != <a href='010core.cc.html#L33'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L241" class="LineNr">241 </span>  <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L242" class="LineNr">242 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L243" class="LineNr">243 </span>  <span class="Delimiter">}</span>
 <span id="L244" class="LineNr">244 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L245" class="LineNr">245 </span><span class="Delimiter">}</span>
@@ -311,7 +311,7 @@ if ('onhashchange' in window) {
 <span id="L247" class="LineNr">247 </span><span class="Delimiter">:(scenario jle_rel16_greater)</span>
 <span id="L248" class="LineNr">248 </span><span class="Special">% ZF = false;</span>
 <span id="L249" class="LineNr">249 </span><span class="Special">% SF = false;</span>
-<span id="L250" class="LineNr">250 </span><span class="Special">% <a href='010core.cc.html#L31'>OF</a> = false;</span>
+<span id="L250" class="LineNr">250 </span><span class="Special">% <a href='010core.cc.html#L33'>OF</a> = false;</span>
 <span id="L251" class="LineNr">251 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L252" class="LineNr">252 </span>  <span class="Constant">0f</span> 8e             <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
 <span id="L253" class="LineNr">253 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
diff --git a/subx/010core.cc b/subx/010core.cc
index 8040a645..a23418db 100644
--- a/subx/010core.cc
+++ b/subx/010core.cc
@@ -1,4 +1,6 @@
-//:: simulated x86 registers
+//:: simulated x86 registers; just a subset
+//:    assume segment registers are hard-coded to 0
+//:    no floating-point, MMX, etc. yet
 
 :(before "End Types")
 enum {