about summary refs log tree commit diff stats
path: root/html
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2018-09-07 15:08:54 -0700
committerKartik Agaram <vc@akkartik.com>2018-09-07 15:08:54 -0700
commit608a7fa8d0faf9a3e3d182d9eabe969804443aab (patch)
tree7e1934d9ef0e8372381c306312591235c4f27110 /html
parenta6517ed821ff39fa56eb3b975799d22497d78a48 (diff)
downloadmu-608a7fa8d0faf9a3e3d182d9eabe969804443aab.tar.gz
4536
Diffstat (limited to 'html')
-rw-r--r--html/subx/010---vm.cc.html20
-rw-r--r--html/subx/011run.cc.html449
-rw-r--r--html/subx/012elf.cc.html221
-rw-r--r--html/subx/013direct_addressing.cc.html127
-rw-r--r--html/subx/014indirect_addressing.cc.html477
-rw-r--r--html/subx/015immediate_addressing.cc.html164
-rw-r--r--html/subx/016index_addressing.cc.html16
-rw-r--r--html/subx/017jump_disp8.cc.html18
-rw-r--r--html/subx/018jump_disp16.cc.html18
-rw-r--r--html/subx/019functions.cc.html30
-rw-r--r--html/subx/020syscalls.cc.html32
-rw-r--r--html/subx/028translate.cc.html131
-rw-r--r--html/subx/029transforms.cc.html6
-rw-r--r--html/subx/030---operands.cc.html462
-rw-r--r--html/subx/031check_operands.cc.html706
-rw-r--r--html/subx/032check_operand_bounds.cc.html32
-rw-r--r--html/subx/034compute_segment_address.cc.html120
-rw-r--r--html/subx/035labels.cc.html432
-rw-r--r--html/subx/036global_variables.cc.html178
-rw-r--r--html/subx/apps/factorial.subx.html (renamed from html/subx/ex7.subx.html)18
-rw-r--r--html/subx/ex8.subx.html159
-rw-r--r--html/subx/examples/ex1.1.subx.html (renamed from html/subx/ex1.1.subx.html)8
-rw-r--r--html/subx/examples/ex1.2.subx.html (renamed from html/subx/ex1.2.subx.html)8
-rw-r--r--html/subx/examples/ex2.subx.html (renamed from html/subx/ex2.subx.html)8
-rw-r--r--html/subx/examples/ex3.subx.html (renamed from html/subx/ex3.subx.html)12
-rw-r--r--html/subx/examples/ex4.subx.html (renamed from html/subx/ex4.subx.html)25
-rw-r--r--html/subx/examples/ex5.subx.html (renamed from html/subx/ex5.subx.html)12
-rw-r--r--html/subx/examples/ex6.subx.html (renamed from html/subx/ex6.subx.html)24
-rw-r--r--html/subx/examples/ex7.subx.html163
-rw-r--r--html/subx/examples/ex8.subx.html120
30 files changed, 2341 insertions, 1855 deletions
diff --git a/html/subx/010---vm.cc.html b/html/subx/010---vm.cc.html
index 06951ccb..032f8850 100644
--- a/html/subx/010---vm.cc.html
+++ b/html/subx/010---vm.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/010---vm.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.CommentedCode { color: #6c6c6c; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.CommentedCode { color: #6c6c6c; }
-.cSpecial { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -152,12 +152,12 @@ if ('onhashchange' in window) {
 <span id="L91" class="LineNr"> 91 </span>
 <span id="L92" class="LineNr"> 92 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
 <span id="L93" class="LineNr"> 93 </span>vector&lt;<span class="Normal">uint8_t</span>&gt; <a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">;</span>
-<span id="L94" class="LineNr"> 94 </span><span class="Normal">uint32_t</span> <a href='010---vm.cc.html#L94'>Mem_offset</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L94" class="LineNr"> 94 </span><span class="Normal">uint32_t</span> Mem_offset = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L95" class="LineNr"> 95 </span><span class="Normal">uint32_t</span> <a href='010---vm.cc.html#L95'>End_of_program</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L96" class="LineNr"> 96 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
 <span id="L97" class="LineNr"> 97 </span><a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
 <span id="L98" class="LineNr"> 98 </span><a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1024</span><span class="Delimiter">);</span>
-<span id="L99" class="LineNr"> 99 </span><a href='010---vm.cc.html#L94'>Mem_offset</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L99" class="LineNr"> 99 </span>Mem_offset = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L100" class="LineNr">100 </span><a href='010---vm.cc.html#L95'>End_of_program</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L101" class="LineNr">101 </span><span class="Delimiter">:(code)</span>
 <span id="L102" class="LineNr">102 </span><span class="Comment">// These helpers depend on Mem being laid out contiguously (so you can't use a</span>
@@ -309,7 +309,7 @@ if ('onhashchange' in window) {
 <span id="L248" class="LineNr">248 </span>    cerr &lt;&lt; <span class="Constant">&quot;  f3 &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L249" class="LineNr">249 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010---vm.cc.html#L231'>name_f3_0f</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010---vm.cc.html#L231'>name_f3_0f</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
 <span id="L250" class="LineNr">250 </span>    cerr &lt;&lt; <span class="Constant">&quot;  f3 0f &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L251" class="LineNr">251 </span>  cerr &lt;&lt; <span class="Constant">&quot;Run `subx help instructions` for details on <a href='011run.cc.html#L111'>words</a> like 'r32' and 'disp8'.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L251" class="LineNr">251 </span>  cerr &lt;&lt; <span class="Constant">&quot;Run `subx help instructions` for details on <a href='011run.cc.html#L115'>words</a> like 'r32' and 'disp8'.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L252" class="LineNr">252 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L253" class="LineNr">253 </span><span class="Delimiter">}</span>
 <span id="L254" class="LineNr">254 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Contents&quot;)</span>
diff --git a/html/subx/011run.cc.html b/html/subx/011run.cc.html
index 653447d6..272d248b 100644
--- a/html/subx/011run.cc.html
+++ b/html/subx/011run.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/011run.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.traceContains { color: #008000; }
+.PreProc { color: #800080; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.SalientComment { color: #00ffff; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.traceContains { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -69,13 +69,13 @@ if ('onhashchange' in window) {
 <span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Texts&quot;)</span>
 <span id="L7" class="LineNr">  7 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;syntax&quot;</span><span class="Delimiter">,</span>
 <span id="L8" class="LineNr">  8 </span>  <span class="Constant">&quot;SubX programs consist of <a href='011run.cc.html#L97'>segments</a>, each segment in turn consisting of lines.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L9" class="LineNr">  9 </span>  <span class="Constant">&quot;Line-endings are significant; each <a href='011run.cc.html#L110'>line</a> should contain a single</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L9" class="LineNr">  9 </span>  <span class="Constant">&quot;Line-endings are significant; each <a href='011run.cc.html#L114'>line</a> should contain a single</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L10" class="LineNr"> 10 </span>  <span class="Constant">&quot;instruction, macro or directive.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L11" class="LineNr"> 11 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L12" class="LineNr"> 12 </span>  <span class="Constant">&quot;Comments <a href='011run.cc.html#L105'>start</a> with the '#' character. It should be at the <a href='011run.cc.html#L105'>start</a> of a <a href='011run.cc.html#L116'>word</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L13" class="LineNr"> 13 </span>  <span class="Constant">&quot;(start of <a href='011run.cc.html#L110'>line</a>, or following a space).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L12" class="LineNr"> 12 </span>  <span class="Constant">&quot;Comments <a href='011run.cc.html#L105'>start</a> with the '#' character. It should be at the <a href='011run.cc.html#L105'>start</a> of a <a href='011run.cc.html#L120'>word</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L13" class="LineNr"> 13 </span>  <span class="Constant">&quot;(start of <a href='011run.cc.html#L114'>line</a>, or following a space).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L14" class="LineNr"> 14 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L15" class="LineNr"> 15 </span>  <span class="Constant">&quot;Each segment starts with a header <a href='011run.cc.html#L110'>line</a>: a '==' delimiter followed by the</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L15" class="LineNr"> 15 </span>  <span class="Constant">&quot;Each segment starts with a header <a href='011run.cc.html#L114'>line</a>: a '==' delimiter followed by the</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L16" class="LineNr"> 16 </span>  <span class="Constant">&quot;starting address for the segment.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L17" class="LineNr"> 17 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L18" class="LineNr"> 18 </span>  <span class="Constant">&quot;The starting address for a segment has some finicky requirements. But just</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
@@ -86,7 +86,7 @@ if ('onhashchange' in window) {
 <span id="L23" class="LineNr"> 23 </span>  <span class="Constant">&quot;(most common page size) bytes after the last.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Constant">&quot;If a segment occupies than 0x1000 bytes you'll need to push subsequent</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Constant">&quot;segments further down.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L26" class="LineNr"> 26 </span>  <span class="Constant">&quot;Currently only the first segment contains executable code (because it gets</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L26" class="LineNr"> 26 </span>  <span class="Constant">&quot;Currently only the first segment contains executable <a href='031check_operands.cc.html#L14'>code</a> (because it gets</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L27" class="LineNr"> 27 </span>  <span class="Constant">&quot;annoying to have to change addresses in later <a href='011run.cc.html#L97'>segments</a> every time an earlier</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Constant">&quot;one changes length; one of those finicky requirements).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L29" class="LineNr"> 29 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
@@ -95,7 +95,7 @@ if ('onhashchange' in window) {
 <span id="L32" class="LineNr"> 32 </span>  <span class="Constant">&quot;at runtime, but can be handy when rewriting macros.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L33" class="LineNr"> 33 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L34" class="LineNr"> 34 </span>  <span class="Constant">&quot;Check out some examples in this directory (ex*.subx)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L35" class="LineNr"> 35 </span>  <span class="Constant">&quot;Programming in machine code can be annoying, but let's see if we can make</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L35" class="LineNr"> 35 </span>  <span class="Constant">&quot;Programming in machine <a href='031check_operands.cc.html#L14'>code</a> can be annoying, but let's see if we can make</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L36" class="LineNr"> 36 </span>  <span class="Constant">&quot;it nice enough to be able to write a compiler in it.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L37" class="LineNr"> 37 </span><span class="Delimiter">);</span>
 <span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Contents&quot;)</span>
@@ -134,7 +134,7 @@ if ('onhashchange' in window) {
 <span id="L71" class="LineNr"> 71 </span><span class="traceContains">+load: 0x00000003 -&gt; 0b</span>
 <span id="L72" class="LineNr"> 72 </span><span class="traceContains">+load: 0x00000004 -&gt; 0c</span>
 <span id="L73" class="LineNr"> 73 </span><span class="traceContains">+load: 0x00000005 -&gt; 0d</span>
-<span id="L74" class="LineNr"> 74 </span><span class="traceContains">+run: add <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a to <a href='010---vm.cc.html#L23'>reg</a> <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L74" class="LineNr"> 74 </span><span class="traceContains">+run: add <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a to <a href='010---vm.cc.html#L23'>reg</a> <a href='010---vm.cc.html#L13'>EAX</a></span>
 <span id="L75" class="LineNr"> 75 </span><span class="traceContains">+run: storing 0x0d0c0b0a</span>
 <span id="L76" class="LineNr"> 76 </span>
 <span id="L77" class="LineNr"> 77 </span><span class="Delimiter">:(code)</span>
@@ -143,11 +143,11 @@ if ('onhashchange' in window) {
 <span id="L80" class="LineNr"> 80 </span><span class="Normal">void</span> <a href='011run.cc.html#L80'>run</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L81" class="LineNr"> 81 </span>  <a href='011run.cc.html#L96'>program</a> p<span class="Delimiter">;</span>
 <span id="L82" class="LineNr"> 82 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
-<span id="L83" class="LineNr"> 83 </span>  <a href='011run.cc.html#L125'>parse</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
+<span id="L83" class="LineNr"> 83 </span>  <a href='011run.cc.html#L129'>parse</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
 <span id="L84" class="LineNr"> 84 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// if any stage raises errors, stop immediately</span>
-<span id="L85" class="LineNr"> 85 </span>  <a href='011run.cc.html#L186'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L85" class="LineNr"> 85 </span>  <a href='011run.cc.html#L193'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L87" class="LineNr"> 87 </span>  <a href='011run.cc.html#L195'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L87" class="LineNr"> 87 </span>  <a href='011run.cc.html#L202'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
 <span id="L88" class="LineNr"> 88 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L89" class="LineNr"> 89 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a> &lt; <a href='010---vm.cc.html#L95'>End_of_program</a><span class="Delimiter">)</span>
 <span id="L90" class="LineNr"> 90 </span>    <a href='010---vm.cc.html#L150'>run_one_instruction</a><span class="Delimiter">();</span>
@@ -167,198 +167,237 @@ if ('onhashchange' in window) {
 <span id="L104" class="LineNr">104 </span><span class="Normal">struct</span> segment <span class="Delimiter">{</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Normal">uint32_t</span> <a href='011run.cc.html#L105'>start</a><span class="Delimiter">;</span>
 <span id="L106" class="LineNr">106 </span>  vector&lt;line&gt; <a href='011run.cc.html#L106'>lines</a><span class="Delimiter">;</span>
-<span id="L107" class="LineNr">107 </span>  segment<span class="Delimiter">()</span> :<a href='011run.cc.html#L105'>start</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
-<span id="L108" class="LineNr">108 </span><span class="Delimiter">};</span>
-<span id="L109" class="LineNr">109 </span><span class="Delimiter">:(before &quot;struct segment&quot;)</span>
-<span id="L110" class="LineNr">110 </span><span class="Normal">struct</span> <a href='011run.cc.html#L110'>line</a> <span class="Delimiter">{</span>
-<span id="L111" class="LineNr">111 </span>  vector&lt;word&gt; <a href='011run.cc.html#L111'>words</a><span class="Delimiter">;</span>
-<span id="L112" class="LineNr">112 </span>  vector&lt;string&gt; metadata<span class="Delimiter">;</span>
-<span id="L113" class="LineNr">113 </span>  string original<span class="Delimiter">;</span>
-<span id="L114" class="LineNr">114 </span><span class="Delimiter">};</span>
-<span id="L115" class="LineNr">115 </span><span class="Delimiter">:(before &quot;struct line&quot;)</span>
-<span id="L116" class="LineNr">116 </span><span class="Normal">struct</span> <a href='011run.cc.html#L116'>word</a> <span class="Delimiter">{</span>
+<span id="L107" class="LineNr">107 </span>  <span class="Comment">// End segment Fields</span>
+<span id="L108" class="LineNr">108 </span>  segment<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L109" class="LineNr">109 </span>    <a href='011run.cc.html#L105'>start</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L110" class="LineNr">110 </span>    <span class="Comment">// End segment Constructor</span>
+<span id="L111" class="LineNr">111 </span>  <span class="Delimiter">}</span>
+<span id="L112" class="LineNr">112 </span><span class="Delimiter">};</span>
+<span id="L113" class="LineNr">113 </span><span class="Delimiter">:(before &quot;struct segment&quot;)</span>
+<span id="L114" class="LineNr">114 </span><span class="Normal">struct</span> <a href='011run.cc.html#L114'>line</a> <span class="Delimiter">{</span>
+<span id="L115" class="LineNr">115 </span>  vector&lt;word&gt; <a href='011run.cc.html#L115'>words</a><span class="Delimiter">;</span>
+<span id="L116" class="LineNr">116 </span>  vector&lt;string&gt; metadata<span class="Delimiter">;</span>
 <span id="L117" class="LineNr">117 </span>  string original<span class="Delimiter">;</span>
-<span id="L118" class="LineNr">118 </span>  string <a href='011run.cc.html#L118'>data</a><span class="Delimiter">;</span>
-<span id="L119" class="LineNr">119 </span>  vector&lt;string&gt; metadata<span class="Delimiter">;</span>
-<span id="L120" class="LineNr">120 </span><span class="Delimiter">};</span>
-<span id="L121" class="LineNr">121 </span>
-<span id="L122" class="LineNr">122 </span><span class="SalientComment">//:: parse</span>
-<span id="L123" class="LineNr">123 </span>
-<span id="L124" class="LineNr">124 </span><span class="Delimiter">:(code)</span>
-<span id="L125" class="LineNr">125 </span><span class="Normal">void</span> <a href='011run.cc.html#L125'>parse</a><span class="Delimiter">(</span>istream&amp; fin<span class="Delimiter">,</span> program&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L126" class="LineNr">126 </span>  vector&lt;line&gt; l<span class="Delimiter">;</span>
-<span id="L127" class="LineNr">127 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L128" class="LineNr">128 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>has_data</a><span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L129" class="LineNr">129 </span>    string line_data<span class="Delimiter">;</span>
-<span id="L130" class="LineNr">130 </span>    <a href='011run.cc.html#L110'>line</a> curr<span class="Delimiter">;</span>
-<span id="L131" class="LineNr">131 </span>    getline<span class="Delimiter">(</span>fin<span class="Delimiter">,</span> line_data<span class="Delimiter">);</span>
-<span id="L132" class="LineNr">132 </span>    curr<span class="Delimiter">.</span>original = line_data<span class="Delimiter">;</span>
-<span id="L133" class="LineNr">133 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;line: &quot;</span> &lt;&lt; line_data &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L134" class="LineNr">134 </span>    istringstream lin<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span>
-<span id="L135" class="LineNr">135 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>has_data</a><span class="Delimiter">(</span>lin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L136" class="LineNr">136 </span>      string word_data<span class="Delimiter">;</span>
-<span id="L137" class="LineNr">137 </span>      lin &gt;&gt; word_data<span class="Delimiter">;</span>
-<span id="L138" class="LineNr">138 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L139" class="LineNr">139 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data[<span class="Constant">0</span>] == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// comment</span>
-<span id="L140" class="LineNr">140 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data == <span class="Constant">&quot;.&quot;</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// comment token</span>
-<span id="L141" class="LineNr">141 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data == <span class="Constant">&quot;==&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L142" class="LineNr">142 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!l<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L143" class="LineNr">143 </span>          assert<span class="Delimiter">(</span>!out<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L144" class="LineNr">144 </span>          <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;flushing to segment&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L145" class="LineNr">145 </span>          out<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>l<span class="Delimiter">);</span>
-<span id="L146" class="LineNr">146 </span>        <span class="Delimiter">}</span>
-<span id="L147" class="LineNr">147 </span>        segment s<span class="Delimiter">;</span>
-<span id="L148" class="LineNr">148 </span>        lin &gt;&gt; std::hex &gt;&gt; s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a><span class="Delimiter">;</span>
-<span id="L149" class="LineNr">149 </span>        <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new segment from &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L150" class="LineNr">150 </span>        out<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
-<span id="L151" class="LineNr">151 </span>        <span class="Comment">// todo?</span>
-<span id="L152" class="LineNr">152 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// skip rest of line</span>
-<span id="L153" class="LineNr">153 </span>      <span class="Delimiter">}</span>
-<span id="L154" class="LineNr">154 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data[<span class="Constant">0</span>] == <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L155" class="LineNr">155 </span>        <span class="Comment">// todo: line metadata</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>      curr<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L116'>word</a><span class="Delimiter">());</span>
-<span id="L159" class="LineNr">159 </span>      curr<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>original = word_data<span class="Delimiter">;</span>
-<span id="L160" class="LineNr">160 </span>      istringstream win<span class="Delimiter">(</span>word_data<span class="Delimiter">);</span>
-<span id="L161" class="LineNr">161 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>getline<span class="Delimiter">(</span>win<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L162" class="LineNr">162 </span>        string m<span class="Delimiter">;</span>
-<span id="L163" class="LineNr">163 </span>        <span class="Normal">while</span> <span class="Delimiter">(</span>getline<span class="Delimiter">(</span>win<span class="Delimiter">,</span> m<span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">))</span>
-<span id="L164" class="LineNr">164 </span>          curr<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>m<span class="Delimiter">);</span>
-<span id="L165" class="LineNr">165 </span>      <span class="Delimiter">}</span>
-<span id="L166" class="LineNr">166 </span>      <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new <a href='011run.cc.html#L116'>word</a>: &quot;</span> &lt;&lt; curr<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L118'>data</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L167" class="LineNr">167 </span>    <span class="Delimiter">}</span>
-<span id="L168" class="LineNr">168 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
-<span id="L169" class="LineNr">169 </span>      l<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L170" class="LineNr">170 </span>  <span class="Delimiter">}</span>
-<span id="L171" class="LineNr">171 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!l<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L172" class="LineNr">172 </span>    assert<span class="Delimiter">(</span>!out<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L173" class="LineNr">173 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;flushing to segment&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L174" class="LineNr">174 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>l<span class="Delimiter">);</span>
-<span id="L175" class="LineNr">175 </span>  <span class="Delimiter">}</span>
-<span id="L176" class="LineNr">176 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L177" class="LineNr">177 </span><span class="Delimiter">}</span>
-<span id="L178" class="LineNr">178 </span>
-<span id="L179" class="LineNr">179 </span><span class="SalientComment">//:: transform</span>
-<span id="L180" class="LineNr">180 </span>
-<span id="L181" class="LineNr">181 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L182" class="LineNr">182 </span><span class="Normal">typedef</span> <span class="Normal">void</span> <span class="Delimiter">(</span>*transform_fn<span class="Delimiter">)(</span>program&amp;<span class="Delimiter">);</span>
-<span id="L183" class="LineNr">183 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L184" class="LineNr">184 </span>vector&lt;transform_fn&gt; <a href='011run.cc.html#L184'>Transform</a><span class="Delimiter">;</span>
+<span id="L118" class="LineNr">118 </span><span class="Delimiter">};</span>
+<span id="L119" class="LineNr">119 </span><span class="Delimiter">:(before &quot;struct line&quot;)</span>
+<span id="L120" class="LineNr">120 </span><span class="Normal">struct</span> <a href='011run.cc.html#L120'>word</a> <span class="Delimiter">{</span>
+<span id="L121" class="LineNr">121 </span>  string original<span class="Delimiter">;</span>
+<span id="L122" class="LineNr">122 </span>  string <a href='011run.cc.html#L122'>data</a><span class="Delimiter">;</span>
+<span id="L123" class="LineNr">123 </span>  vector&lt;string&gt; metadata<span class="Delimiter">;</span>
+<span id="L124" class="LineNr">124 </span><span class="Delimiter">};</span>
+<span id="L125" class="LineNr">125 </span>
+<span id="L126" class="LineNr">126 </span><span class="SalientComment">//:: parse</span>
+<span id="L127" class="LineNr">127 </span>
+<span id="L128" class="LineNr">128 </span><span class="Delimiter">:(code)</span>
+<span id="L129" class="LineNr">129 </span><span class="Normal">void</span> <a href='011run.cc.html#L129'>parse</a><span class="Delimiter">(</span>istream&amp; fin<span class="Delimiter">,</span> program&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L130" class="LineNr">130 </span>  vector&lt;line&gt; l<span class="Delimiter">;</span>
+<span id="L131" class="LineNr">131 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L132" class="LineNr">132 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>has_data</a><span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L133" class="LineNr">133 </span>    string line_data<span class="Delimiter">;</span>
+<span id="L134" class="LineNr">134 </span>    <a href='011run.cc.html#L114'>line</a> curr<span class="Delimiter">;</span>
+<span id="L135" class="LineNr">135 </span>    getline<span class="Delimiter">(</span>fin<span class="Delimiter">,</span> line_data<span class="Delimiter">);</span>
+<span id="L136" class="LineNr">136 </span>    curr<span class="Delimiter">.</span>original = line_data<span class="Delimiter">;</span>
+<span id="L137" class="LineNr">137 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;line: &quot;</span> &lt;&lt; line_data &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L138" class="LineNr">138 </span>    istringstream lin<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span>
+<span id="L139" class="LineNr">139 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>has_data</a><span class="Delimiter">(</span>lin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L140" class="LineNr">140 </span>      string word_data<span class="Delimiter">;</span>
+<span id="L141" class="LineNr">141 </span>      lin &gt;&gt; word_data<span class="Delimiter">;</span>
+<span id="L142" class="LineNr">142 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L143" class="LineNr">143 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data[<span class="Constant">0</span>] == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// comment</span>
+<span id="L144" class="LineNr">144 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data == <span class="Constant">&quot;.&quot;</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// comment token</span>
+<span id="L145" class="LineNr">145 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data == <span class="Constant">&quot;==&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L146" class="LineNr">146 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!l<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L147" class="LineNr">147 </span>          assert<span class="Delimiter">(</span>!out<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L148" class="LineNr">148 </span>          <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;flushing to segment&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L149" class="LineNr">149 </span>          out<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>l<span class="Delimiter">);</span>
+<span id="L150" class="LineNr">150 </span>        <span class="Delimiter">}</span>
+<span id="L151" class="LineNr">151 </span>        segment s<span class="Delimiter">;</span>
+<span id="L152" class="LineNr">152 </span>        string segment_title<span class="Delimiter">;</span>
+<span id="L153" class="LineNr">153 </span>        lin &gt;&gt; segment_title<span class="Delimiter">;</span>
+<span id="L154" class="LineNr">154 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span>segment_title<span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span>
+<span id="L155" class="LineNr">155 </span>          s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a> = <a href='011run.cc.html#L308'>parse_int</a><span class="Delimiter">(</span>segment_title<span class="Delimiter">);</span>
+<span id="L156" class="LineNr">156 </span>        <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new segment from &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L157" class="LineNr">157 </span>        out<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L158" class="LineNr">158 </span>        <span class="Comment">// todo?</span>
+<span id="L159" class="LineNr">159 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// skip rest of line</span>
+<span id="L160" class="LineNr">160 </span>      <span class="Delimiter">}</span>
+<span id="L161" class="LineNr">161 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>word_data[<span class="Constant">0</span>] == <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L162" class="LineNr">162 </span>        <span class="Comment">// todo: line metadata</span>
+<span id="L163" class="LineNr">163 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L164" class="LineNr">164 </span>      <span class="Delimiter">}</span>
+<span id="L165" class="LineNr">165 </span>      curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L120'>word</a><span class="Delimiter">());</span>
+<span id="L166" class="LineNr">166 </span>      curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>original = word_data<span class="Delimiter">;</span>
+<span id="L167" class="LineNr">167 </span>      istringstream win<span class="Delimiter">(</span>word_data<span class="Delimiter">);</span>
+<span id="L168" class="LineNr">168 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>getline<span class="Delimiter">(</span>win<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L169" class="LineNr">169 </span>        string m<span class="Delimiter">;</span>
+<span id="L170" class="LineNr">170 </span>        <span class="Normal">while</span> <span class="Delimiter">(</span>getline<span class="Delimiter">(</span>win<span class="Delimiter">,</span> m<span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">))</span>
+<span id="L171" class="LineNr">171 </span>          curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>m<span class="Delimiter">);</span>
+<span id="L172" class="LineNr">172 </span>      <span class="Delimiter">}</span>
+<span id="L173" class="LineNr">173 </span>      <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new <a href='011run.cc.html#L120'>word</a>: &quot;</span> &lt;&lt; curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L122'>data</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L174" class="LineNr">174 </span>    <span class="Delimiter">}</span>
+<span id="L175" class="LineNr">175 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
+<span id="L176" class="LineNr">176 </span>      l<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L177" class="LineNr">177 </span>  <span class="Delimiter">}</span>
+<span id="L178" class="LineNr">178 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!l<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L179" class="LineNr">179 </span>    assert<span class="Delimiter">(</span>!out<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L180" class="LineNr">180 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;flushing to segment&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L181" class="LineNr">181 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>l<span class="Delimiter">);</span>
+<span id="L182" class="LineNr">182 </span>  <span class="Delimiter">}</span>
+<span id="L183" class="LineNr">183 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L184" class="LineNr">184 </span><span class="Delimiter">}</span>
 <span id="L185" class="LineNr">185 </span>
-<span id="L186" class="LineNr">186 </span><span class="Normal">void</span> <a href='011run.cc.html#L186'>transform</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L187" class="LineNr">187 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L188" class="LineNr">188 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> t = <span class="Constant">0</span><span class="Delimiter">;</span>  t &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='011run.cc.html#L184'>Transform</a><span class="Delimiter">);</span>  ++t<span class="Delimiter">)</span>
-<span id="L189" class="LineNr">189 </span>    <span class="Delimiter">(</span>*Transform<span class="Delimiter">.</span>at<span class="Delimiter">(</span>t<span class="Delimiter">))(</span>p<span class="Delimiter">);</span>
-<span id="L190" class="LineNr">190 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L191" class="LineNr">191 </span><span class="Delimiter">}</span>
+<span id="L186" class="LineNr">186 </span><span class="SalientComment">//:: transform</span>
+<span id="L187" class="LineNr">187 </span>
+<span id="L188" class="LineNr">188 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L189" class="LineNr">189 </span><span class="Normal">typedef</span> <span class="Normal">void</span> <span class="Delimiter">(</span>*transform_fn<span class="Delimiter">)(</span>program&amp;<span class="Delimiter">);</span>
+<span id="L190" class="LineNr">190 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L191" class="LineNr">191 </span>vector&lt;transform_fn&gt; <a href='011run.cc.html#L191'>Transform</a><span class="Delimiter">;</span>
 <span id="L192" class="LineNr">192 </span>
-<span id="L193" class="LineNr">193 </span><span class="SalientComment">//:: load</span>
-<span id="L194" class="LineNr">194 </span>
-<span id="L195" class="LineNr">195 </span><span class="Normal">void</span> <a href='011run.cc.html#L195'>load</a><span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L196" class="LineNr">196 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L197" class="LineNr">197 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L198" class="LineNr">198 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;no code to <a href='011run.cc.html#L80'>run</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L199" class="LineNr">199 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L200" class="LineNr">200 </span>  <span class="Delimiter">}</span>
-<span id="L201" class="LineNr">201 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>   i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L202" class="LineNr">202 </span>    <span class="Normal">const</span> segment&amp; seg = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L203" class="LineNr">203 </span>    <span class="Normal">uint32_t</span> addr = seg<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a><span class="Delimiter">;</span>
-<span id="L204" class="LineNr">204 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;loading segment &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; from &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L205" class="LineNr">205 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>seg<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L206" class="LineNr">206 </span>      <span class="Normal">const</span> line&amp; l = seg<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L207" class="LineNr">207 </span>      <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> k = <span class="Constant">0</span><span class="Delimiter">;</span>  k &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++k<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L208" class="LineNr">208 </span>        <span class="Normal">const</span> word&amp; w = l<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>k<span class="Delimiter">);</span>
-<span id="L209" class="LineNr">209 </span>        <span class="Normal">uint8_t</span> val = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">);</span>
-<span id="L210" class="LineNr">210 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L211" class="LineNr">211 </span>        <a href='010---vm.cc.html#L133'>write_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
-<span id="L212" class="LineNr">212 </span>        <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L259'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L104'>read_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L213" class="LineNr">213 </span>        ++addr<span class="Delimiter">;</span>
-<span id="L214" class="LineNr">214 </span>      <span class="Delimiter">}</span>
-<span id="L215" class="LineNr">215 </span>    <span class="Delimiter">}</span>
-<span id="L216" class="LineNr">216 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> <a href='010---vm.cc.html#L95'>End_of_program</a> = addr<span class="Delimiter">;</span>
-<span id="L217" class="LineNr">217 </span>  <span class="Delimiter">}</span>
-<span id="L218" class="LineNr">218 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L105'>start</a><span class="Delimiter">;</span>
-<span id="L219" class="LineNr">219 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L220" class="LineNr">220 </span><span class="Delimiter">}</span>
-<span id="L221" class="LineNr">221 </span>
-<span id="L222" class="LineNr">222 </span><span class="Normal">uint8_t</span> <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L223" class="LineNr">223 </span>  istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
-<span id="L224" class="LineNr">224 </span>  <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L225" class="LineNr">225 </span>  in &gt;&gt; std::hex &gt;&gt; result<span class="Delimiter">;</span>
-<span id="L226" class="LineNr">226 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!in || !in<span class="Delimiter">.</span>eof<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L227" class="LineNr">227 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;token '&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is not a hex byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L228" class="LineNr">228 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
-<span id="L229" class="LineNr">229 </span>  <span class="Delimiter">}</span>
-<span id="L230" class="LineNr">230 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result &gt; <span class="Constant">0xff</span> || result &lt; -<span class="Constant">0x8f</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L231" class="LineNr">231 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;token '&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is not a hex byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L232" class="LineNr">232 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
-<span id="L233" class="LineNr">233 </span>  <span class="Delimiter">}</span>
-<span id="L234" class="LineNr">234 </span>  <span class="Identifier">return</span> <span class="Normal">static_cast</span>&lt;<span class="Normal">uint8_t</span>&gt;<span class="Delimiter">(</span>result<span class="Delimiter">);</span>
-<span id="L235" class="LineNr">235 </span><span class="Delimiter">}</span>
-<span id="L236" class="LineNr">236 </span>
-<span id="L237" class="LineNr">237 </span><span class="Delimiter">:(scenarios parse_and_load)</span>
-<span id="L238" class="LineNr">238 </span><span class="Delimiter">:(scenario number_too_large)</span>
-<span id="L239" class="LineNr">239 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L240" class="LineNr">240 </span>== <span class="Constant">0x1</span>
-<span id="L241" class="LineNr">241 </span><span class="PreProc">0</span><span class="Constant">5</span> cab
-<span id="L242" class="LineNr">242 </span><span class="traceContains">+error: token 'cab' is not a hex byte</span>
+<span id="L193" class="LineNr">193 </span><span class="Normal">void</span> <a href='011run.cc.html#L193'>transform</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L194" class="LineNr">194 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L195" class="LineNr">195 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> t = <span class="Constant">0</span><span class="Delimiter">;</span>  t &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='011run.cc.html#L191'>Transform</a><span class="Delimiter">);</span>  ++t<span class="Delimiter">)</span>
+<span id="L196" class="LineNr">196 </span>    <span class="Delimiter">(</span>*Transform<span class="Delimiter">.</span>at<span class="Delimiter">(</span>t<span class="Delimiter">))(</span>p<span class="Delimiter">);</span>
+<span id="L197" class="LineNr">197 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L198" class="LineNr">198 </span><span class="Delimiter">}</span>
+<span id="L199" class="LineNr">199 </span>
+<span id="L200" class="LineNr">200 </span><span class="SalientComment">//:: load</span>
+<span id="L201" class="LineNr">201 </span>
+<span id="L202" class="LineNr">202 </span><span class="Normal">void</span> <a href='011run.cc.html#L202'>load</a><span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L203" class="LineNr">203 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L204" class="LineNr">204 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L205" class="LineNr">205 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;no <a href='031check_operands.cc.html#L14'>code</a> to <a href='011run.cc.html#L80'>run</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L206" class="LineNr">206 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L207" class="LineNr">207 </span>  <span class="Delimiter">}</span>
+<span id="L208" class="LineNr">208 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>   i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L209" class="LineNr">209 </span>    <span class="Normal">const</span> segment&amp; seg = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L210" class="LineNr">210 </span>    <span class="Normal">uint32_t</span> addr = seg<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a><span class="Delimiter">;</span>
+<span id="L211" class="LineNr">211 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;loading segment &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; from &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L212" class="LineNr">212 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>seg<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L213" class="LineNr">213 </span>      <span class="Normal">const</span> line&amp; l = seg<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L214" class="LineNr">214 </span>      <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> k = <span class="Constant">0</span><span class="Delimiter">;</span>  k &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++k<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L215" class="LineNr">215 </span>        <span class="Normal">const</span> word&amp; w = l<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>k<span class="Delimiter">);</span>
+<span id="L216" class="LineNr">216 </span>        <span class="Normal">uint8_t</span> val = <a href='011run.cc.html#L229'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
+<span id="L217" class="LineNr">217 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L218" class="LineNr">218 </span>        <a href='010---vm.cc.html#L133'>write_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
+<span id="L219" class="LineNr">219 </span>        <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L259'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L104'>read_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L220" class="LineNr">220 </span>        ++addr<span class="Delimiter">;</span>
+<span id="L221" class="LineNr">221 </span>      <span class="Delimiter">}</span>
+<span id="L222" class="LineNr">222 </span>    <span class="Delimiter">}</span>
+<span id="L223" class="LineNr">223 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> <a href='010---vm.cc.html#L95'>End_of_program</a> = addr<span class="Delimiter">;</span>
+<span id="L224" class="LineNr">224 </span>  <span class="Delimiter">}</span>
+<span id="L225" class="LineNr">225 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L105'>start</a><span class="Delimiter">;</span>
+<span id="L226" class="LineNr">226 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L227" class="LineNr">227 </span><span class="Delimiter">}</span>
+<span id="L228" class="LineNr">228 </span>
+<span id="L229" class="LineNr">229 </span><span class="Normal">uint8_t</span> <a href='011run.cc.html#L229'>hex_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L230" class="LineNr">230 </span>  istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L231" class="LineNr">231 </span>  <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L232" class="LineNr">232 </span>  in &gt;&gt; std::hex &gt;&gt; result<span class="Delimiter">;</span>
+<span id="L233" class="LineNr">233 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!in || !in<span class="Delimiter">.</span>eof<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L234" class="LineNr">234 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;token '&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is not a hex byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L235" class="LineNr">235 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
+<span id="L236" class="LineNr">236 </span>  <span class="Delimiter">}</span>
+<span id="L237" class="LineNr">237 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result &gt; <span class="Constant">0xff</span> || result &lt; -<span class="Constant">0x8f</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L238" class="LineNr">238 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;token '&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is not a hex byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L239" class="LineNr">239 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
+<span id="L240" class="LineNr">240 </span>  <span class="Delimiter">}</span>
+<span id="L241" class="LineNr">241 </span>  <span class="Identifier">return</span> <span class="Normal">static_cast</span>&lt;<span class="Normal">uint8_t</span>&gt;<span class="Delimiter">(</span>result<span class="Delimiter">);</span>
+<span id="L242" class="LineNr">242 </span><span class="Delimiter">}</span>
 <span id="L243" class="LineNr">243 </span>
-<span id="L244" class="LineNr">244 </span><span class="Delimiter">:(scenario invalid_hex)</span>
-<span id="L245" class="LineNr">245 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L246" class="LineNr">246 </span>== <span class="Constant">0x1</span>
-<span id="L247" class="LineNr">247 </span><span class="PreProc">0</span><span class="Constant">5</span> cx
-<span id="L248" class="LineNr">248 </span><span class="traceContains">+error: token 'cx' is not a hex byte</span>
-<span id="L249" class="LineNr">249 </span>
-<span id="L250" class="LineNr">250 </span><span class="Delimiter">:(scenario negative_number)</span>
-<span id="L251" class="LineNr">251 </span>== <span class="Constant">0x1</span>
-<span id="L252" class="LineNr">252 </span><span class="PreProc">0</span><span class="Constant">5</span> -<span class="Constant">12</span>
-<span id="L253" class="LineNr">253 </span>$error: <span class="Constant">0</span>
-<span id="L254" class="LineNr">254 </span>
-<span id="L255" class="LineNr">255 </span><span class="Delimiter">:(scenario negative_number_too_small)</span>
-<span id="L256" class="LineNr">256 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L257" class="LineNr">257 </span>== <span class="Constant">0x1</span>
-<span id="L258" class="LineNr">258 </span><span class="PreProc">0</span><span class="Constant">5</span> -<span class="Constant">12345</span>
-<span id="L259" class="LineNr">259 </span><span class="traceContains">+error: token '-12345' is not a hex byte</span>
-<span id="L260" class="LineNr">260 </span>
-<span id="L261" class="LineNr">261 </span><span class="Delimiter">:(scenario hex_prefix)</span>
-<span id="L262" class="LineNr">262 </span>== <span class="Constant">0x1</span>
-<span id="L263" class="LineNr">263 </span><span class="Constant">0x05</span> -<span class="Constant">0x12</span>
-<span id="L264" class="LineNr">264 </span>$error: <span class="Constant">0</span>
-<span id="L265" class="LineNr">265 </span>
-<span id="L266" class="LineNr">266 </span><span class="Comment">//: helper for tests</span>
-<span id="L267" class="LineNr">267 </span><span class="Delimiter">:(code)</span>
-<span id="L268" class="LineNr">268 </span><span class="Normal">void</span> <a href='011run.cc.html#L268'>parse_and_load</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L269" class="LineNr">269 </span>  <a href='011run.cc.html#L96'>program</a> p<span class="Delimiter">;</span>
-<span id="L270" class="LineNr">270 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
-<span id="L271" class="LineNr">271 </span>  <a href='011run.cc.html#L125'>parse</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L272" class="LineNr">272 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// if any stage raises errors, stop immediately</span>
-<span id="L273" class="LineNr">273 </span>  <a href='011run.cc.html#L195'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L274" class="LineNr">274 </span><span class="Delimiter">}</span>
-<span id="L275" class="LineNr">275 </span>
-<span id="L276" class="LineNr">276 </span><span class="SalientComment">//:: run</span>
-<span id="L277" class="LineNr">277 </span>
-<span id="L278" class="LineNr">278 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L279" class="LineNr">279 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add <a href='011run.cc.html#L292'>imm32</a> to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L280" class="LineNr">280 </span>
-<span id="L281" class="LineNr">281 </span><span class="Comment">//: our first opcode</span>
-<span id="L282" class="LineNr">282 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L283" class="LineNr">283 </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="L284" class="LineNr">284 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L292'>imm32</a><span class="Delimiter">();</span>
-<span id="L285" class="LineNr">285 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add <a href='011run.cc.html#L292'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to <a href='010---vm.cc.html#L23'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L286" class="LineNr">286 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L287" class="LineNr">287 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L288" class="LineNr">288 </span><span class="Delimiter">}</span>
-<span id="L289" class="LineNr">289 </span>
-<span id="L290" class="LineNr">290 </span><span class="Delimiter">:(code)</span>
-<span id="L291" class="LineNr">291 </span><span class="Comment">// read a 32-bit immediate in little-endian order from the instruction stream</span>
-<span id="L292" class="LineNr">292 </span><span class="Normal">int32_t</span> <a href='011run.cc.html#L292'>imm32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L293" class="LineNr">293 </span>  <span class="Normal">int32_t</span> result = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L294" class="LineNr">294 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
-<span id="L295" class="LineNr">295 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
-<span id="L296" class="LineNr">296 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">24</span><span class="Delimiter">);</span>
-<span id="L297" class="LineNr">297 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L298" class="LineNr">298 </span><span class="Delimiter">}</span>
+<span id="L244" class="LineNr">244 </span><span class="Delimiter">:(scenarios parse_and_load)</span>
+<span id="L245" class="LineNr">245 </span><span class="Delimiter">:(scenario number_too_large)</span>
+<span id="L246" class="LineNr">246 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L247" class="LineNr">247 </span>== <span class="Constant">0x1</span>
+<span id="L248" class="LineNr">248 </span><span class="PreProc">0</span><span class="Constant">5</span> cab
+<span id="L249" class="LineNr">249 </span><span class="traceContains">+error: token 'cab' is not a hex byte</span>
+<span id="L250" class="LineNr">250 </span>
+<span id="L251" class="LineNr">251 </span><span class="Delimiter">:(scenario invalid_hex)</span>
+<span id="L252" class="LineNr">252 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L253" class="LineNr">253 </span>== <span class="Constant">0x1</span>
+<span id="L254" class="LineNr">254 </span><span class="PreProc">0</span><span class="Constant">5</span> cx
+<span id="L255" class="LineNr">255 </span><span class="traceContains">+error: token 'cx' is not a hex byte</span>
+<span id="L256" class="LineNr">256 </span>
+<span id="L257" class="LineNr">257 </span><span class="Delimiter">:(scenario negative_number)</span>
+<span id="L258" class="LineNr">258 </span>== <span class="Constant">0x1</span>
+<span id="L259" class="LineNr">259 </span><span class="PreProc">0</span><span class="Constant">5</span> -<span class="Constant">12</span>
+<span id="L260" class="LineNr">260 </span>$error: <span class="Constant">0</span>
+<span id="L261" class="LineNr">261 </span>
+<span id="L262" class="LineNr">262 </span><span class="Delimiter">:(scenario negative_number_too_small)</span>
+<span id="L263" class="LineNr">263 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L264" class="LineNr">264 </span>== <span class="Constant">0x1</span>
+<span id="L265" class="LineNr">265 </span><span class="PreProc">0</span><span class="Constant">5</span> -<span class="Constant">12345</span>
+<span id="L266" class="LineNr">266 </span><span class="traceContains">+error: token '-12345' is not a hex byte</span>
+<span id="L267" class="LineNr">267 </span>
+<span id="L268" class="LineNr">268 </span><span class="Delimiter">:(scenario hex_prefix)</span>
+<span id="L269" class="LineNr">269 </span>== <span class="Constant">0x1</span>
+<span id="L270" class="LineNr">270 </span><span class="Constant">0x05</span> -<span class="Constant">0x12</span>
+<span id="L271" class="LineNr">271 </span>$error: <span class="Constant">0</span>
+<span id="L272" class="LineNr">272 </span>
+<span id="L273" class="LineNr">273 </span><span class="Comment">//: helper for tests</span>
+<span id="L274" class="LineNr">274 </span><span class="Delimiter">:(code)</span>
+<span id="L275" class="LineNr">275 </span><span class="Normal">void</span> <a href='011run.cc.html#L275'>parse_and_load</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L276" class="LineNr">276 </span>  <a href='011run.cc.html#L96'>program</a> p<span class="Delimiter">;</span>
+<span id="L277" class="LineNr">277 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
+<span id="L278" class="LineNr">278 </span>  <a href='011run.cc.html#L129'>parse</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// if any stage raises errors, stop immediately</span>
+<span id="L280" class="LineNr">280 </span>  <a href='011run.cc.html#L202'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L281" class="LineNr">281 </span><span class="Delimiter">}</span>
+<span id="L282" class="LineNr">282 </span>
+<span id="L283" class="LineNr">283 </span><span class="SalientComment">//:: run</span>
+<span id="L284" class="LineNr">284 </span>
+<span id="L285" class="LineNr">285 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L286" class="LineNr">286 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add <a href='011run.cc.html#L299'>imm32</a> to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L287" class="LineNr">287 </span>
+<span id="L288" class="LineNr">288 </span><span class="Comment">//: our first opcode</span>
+<span id="L289" class="LineNr">289 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L290" class="LineNr">290 </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="L291" class="LineNr">291 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
+<span id="L292" class="LineNr">292 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add <a href='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to <a href='010---vm.cc.html#L23'>reg</a> EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L293" class="LineNr">293 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L295" class="LineNr">295 </span><span class="Delimiter">}</span>
+<span id="L296" class="LineNr">296 </span>
+<span id="L297" class="LineNr">297 </span><span class="Delimiter">:(code)</span>
+<span id="L298" class="LineNr">298 </span><span class="Comment">// read a 32-bit immediate in little-endian order from the instruction stream</span>
+<span id="L299" class="LineNr">299 </span><span class="Normal">int32_t</span> <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Normal">int32_t</span> result = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L301" class="LineNr">301 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L302" class="LineNr">302 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
+<span id="L303" class="LineNr">303 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">24</span><span class="Delimiter">);</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L305" class="LineNr">305 </span><span class="Delimiter">}</span>
+<span id="L306" class="LineNr">306 </span>
+<span id="L307" class="LineNr">307 </span><span class="Delimiter">:(code)</span>
+<span id="L308" class="LineNr">308 </span><span class="Normal">int32_t</span> <a href='011run.cc.html#L308'>parse_int</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L309" class="LineNr">309 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L310" class="LineNr">310 </span>  istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L311" class="LineNr">311 </span>  in &gt;&gt; std::hex<span class="Delimiter">;</span>
+<span id="L312" class="LineNr">312 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> == <span class="Constant">'-'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L313" class="LineNr">313 </span>    <span class="Normal">int32_t</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L314" class="LineNr">314 </span>    in &gt;&gt; result<span class="Delimiter">;</span>
+<span id="L315" class="LineNr">315 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!in || !in<span class="Delimiter">.</span>eof<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L316" class="LineNr">316 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;not a number: &quot;</span> &lt;&lt; s &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L317" class="LineNr">317 </span>      <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L318" class="LineNr">318 </span>    <span class="Delimiter">}</span>
+<span id="L319" class="LineNr">319 </span>    <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L320" class="LineNr">320 </span>  <span class="Delimiter">}</span>
+<span id="L321" class="LineNr">321 </span>  <span class="Normal">uint32_t</span> uresult = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L322" class="LineNr">322 </span>  in &gt;&gt; uresult<span class="Delimiter">;</span>
+<span id="L323" class="LineNr">323 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!in || !in<span class="Delimiter">.</span>eof<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L324" class="LineNr">324 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;not a number: &quot;</span> &lt;&lt; s &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L325" class="LineNr">325 </span>    <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L326" class="LineNr">326 </span>  <span class="Delimiter">}</span>
+<span id="L327" class="LineNr">327 </span>  <span class="Identifier">return</span> <span class="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span>uresult<span class="Delimiter">);</span>
+<span id="L328" class="LineNr">328 </span><span class="Delimiter">}</span>
+<span id="L329" class="LineNr">329 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
+<span id="L330" class="LineNr">330 </span><span class="Normal">void</span> <a href='011run.cc.html#L330'>test_parse_int</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L331" class="LineNr">331 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='011run.cc.html#L308'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0&quot;</span><span class="Delimiter">));</span>
+<span id="L332" class="LineNr">332 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='011run.cc.html#L308'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0x0&quot;</span><span class="Delimiter">));</span>
+<span id="L333" class="LineNr">333 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='011run.cc.html#L308'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0x0&quot;</span><span class="Delimiter">));</span>
+<span id="L334" class="LineNr">334 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">16</span><span class="Delimiter">,</span> <a href='011run.cc.html#L308'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;10&quot;</span><span class="Delimiter">));</span>  <span class="Comment">// hex always</span>
+<span id="L335" class="LineNr">335 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>-<span class="Constant">1</span><span class="Delimiter">,</span> <a href='011run.cc.html#L308'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;-1&quot;</span><span class="Delimiter">));</span>
+<span id="L336" class="LineNr">336 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>-<span class="Constant">1</span><span class="Delimiter">,</span> <a href='011run.cc.html#L308'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0xffffffff&quot;</span><span class="Delimiter">));</span>
+<span id="L337" class="LineNr">337 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/012elf.cc.html b/html/subx/012elf.cc.html
index cb4b255d..1d00ccc5 100644
--- a/html/subx/012elf.cc.html
+++ b/html/subx/012elf.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/012elf.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -67,9 +67,9 @@ if ('onhashchange' in window) {
 <span id="L8" class="LineNr">  8 </span>  assert<span class="Delimiter">(</span>argc &gt; <span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L9" class="LineNr">  9 </span>  <a href='000organization.cc.html#L148'>reset</a><span class="Delimiter">();</span>
 <span id="L10" class="LineNr"> 10 </span>  cerr &lt;&lt; std::hex<span class="Delimiter">;</span>
-<span id="L11" class="LineNr"> 11 </span>  <a href='012elf.cc.html#L108'>initialize_mem</a><span class="Delimiter">();</span>
-<span id="L12" class="LineNr"> 12 </span>  <a href='010---vm.cc.html#L94'>Mem_offset</a> = <a href='012elf.cc.html#L104'>CODE_START</a><span class="Delimiter">;</span>
-<span id="L13" class="LineNr"> 13 </span>  <a href='012elf.cc.html#L21'>load_elf</a><span class="Delimiter">(</span>argv[<span class="Constant">2</span>]<span class="Delimiter">);</span>
+<span id="L11" class="LineNr"> 11 </span>  <a href='012elf.cc.html#L131'>initialize_mem</a><span class="Delimiter">();</span>
+<span id="L12" class="LineNr"> 12 </span>  Mem_offset = <a href='012elf.cc.html#L126'>CODE_START</a><span class="Delimiter">;</span>
+<span id="L13" class="LineNr"> 13 </span>  <a href='012elf.cc.html#L21'>load_elf</a><span class="Delimiter">(</span>argv[<span class="Constant">2</span>]<span class="Delimiter">,</span> argc<span class="Delimiter">,</span> argv<span class="Delimiter">);</span>
 <span id="L14" class="LineNr"> 14 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a> &lt; <a href='010---vm.cc.html#L95'>End_of_program</a><span class="Delimiter">)</span>  <span class="Comment">// weak final-gasp termination check</span>
 <span id="L15" class="LineNr"> 15 </span>    <a href='010---vm.cc.html#L150'>run_one_instruction</a><span class="Delimiter">();</span>
 <span id="L16" class="LineNr"> 16 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;executed past <a href='003trace.cc.html#L222'>end</a> of the world: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L95'>End_of_program</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
@@ -77,129 +77,152 @@ if ('onhashchange' in window) {
 <span id="L18" class="LineNr"> 18 </span><span class="Delimiter">}</span>
 <span id="L19" class="LineNr"> 19 </span>
 <span id="L20" class="LineNr"> 20 </span><span class="Delimiter">:(code)</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Normal">void</span> <a href='012elf.cc.html#L21'>load_elf</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; filename<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Normal">void</span> <a href='012elf.cc.html#L21'>load_elf</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; filename<span class="Delimiter">,</span> <span class="Normal">int</span> argc<span class="Delimiter">,</span> <span class="Normal">char</span>* argv[]<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L22" class="LineNr"> 22 </span>  <span class="Normal">int</span> fd = open<span class="Delimiter">(</span>filename<span class="Delimiter">.</span>c_str<span class="Delimiter">(),</span> O_RDONLY<span class="Delimiter">);</span>
-<span id="L23" class="LineNr"> 23 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>fd &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; filename<span class="Delimiter">.</span>c_str<span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;: open&quot;</span> &lt;&lt; <a href='012elf.cc.html#L121'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
+<span id="L23" class="LineNr"> 23 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>fd &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; filename<span class="Delimiter">.</span>c_str<span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;: open&quot;</span> &lt;&lt; <a href='012elf.cc.html#L144'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Normal">off_t</span> size = lseek<span class="Delimiter">(</span>fd<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">SEEK_END</span><span class="Delimiter">);</span>
 <span id="L25" class="LineNr"> 25 </span>  lseek<span class="Delimiter">(</span>fd<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">SEEK_SET</span><span class="Delimiter">);</span>
 <span id="L26" class="LineNr"> 26 </span>  <span class="Normal">uint8_t</span>* elf_contents = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span>malloc<span class="Delimiter">(</span>size<span class="Delimiter">));</span>
-<span id="L27" class="LineNr"> 27 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents == <span class="Constant">NULL</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;malloc(&quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='012elf.cc.html#L121'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
+<span id="L27" class="LineNr"> 27 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents == <span class="Constant">NULL</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;malloc(&quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='012elf.cc.html#L144'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Normal">ssize_t</span> read_size = read<span class="Delimiter">(</span>fd<span class="Delimiter">,</span> elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">);</span>
-<span id="L29" class="LineNr"> 29 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size != read_size<span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;read → &quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">&quot; (!= &quot;</span> &lt;&lt; read_size &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='012elf.cc.html#L121'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
-<span id="L30" class="LineNr"> 30 </span>  <a href='012elf.cc.html#L34'>load_elf_contents</a><span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">);</span>
+<span id="L29" class="LineNr"> 29 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size != read_size<span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;read → &quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">&quot; (!= &quot;</span> &lt;&lt; read_size &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='012elf.cc.html#L144'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
+<span id="L30" class="LineNr"> 30 </span>  <a href='012elf.cc.html#L34'>load_elf_contents</a><span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">,</span> argc<span class="Delimiter">,</span> argv<span class="Delimiter">);</span>
 <span id="L31" class="LineNr"> 31 </span>  free<span class="Delimiter">(</span>elf_contents<span class="Delimiter">);</span>
 <span id="L32" class="LineNr"> 32 </span><span class="Delimiter">}</span>
 <span id="L33" class="LineNr"> 33 </span>
-<span id="L34" class="LineNr"> 34 </span><span class="Normal">void</span> <a href='012elf.cc.html#L34'>load_elf_contents</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* elf_contents<span class="Delimiter">,</span> <span class="Normal">size_t</span> size<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L34" class="LineNr"> 34 </span><span class="Normal">void</span> <a href='012elf.cc.html#L34'>load_elf_contents</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* elf_contents<span class="Delimiter">,</span> <span class="Normal">size_t</span> size<span class="Delimiter">,</span> <span class="Normal">int</span> argc<span class="Delimiter">,</span> <span class="Normal">char</span>* argv[]<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Normal">uint8_t</span> magic[<span class="Constant">5</span>] = <span class="Delimiter">{</span><span class="Constant">0</span><span class="Delimiter">};</span>
 <span id="L36" class="LineNr"> 36 </span>  memcpy<span class="Delimiter">(</span>magic<span class="Delimiter">,</span> elf_contents<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">);</span>
 <span id="L37" class="LineNr"> 37 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>memcmp<span class="Delimiter">(</span>magic<span class="Delimiter">,</span> <span class="Constant">&quot;</span><span class="cSpecial">\177</span><span class="Constant">ELF&quot;</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">)</span> != <span class="Constant">0</span><span class="Delimiter">)</span>
-<span id="L38" class="LineNr"> 38 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid ELF file; starts with </span><span class="cSpecial">\&quot;</span><span class="Constant">&quot;</span> &lt;&lt; magic &lt;&lt; <span class="Constant">'&quot;'</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
+<span id="L38" class="LineNr"> 38 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid ELF file; starts with </span><span class="cSpecial">\&quot;</span><span class="Constant">&quot;</span> &lt;&lt; magic &lt;&lt; <span class="Constant">'&quot;'</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents[<span class="Constant">4</span>] != <span class="Constant">1</span><span class="Delimiter">)</span>
-<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Only 32-bit ELF files (4-byte words; virtual addresses up to 4GB) supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
+<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Only 32-bit ELF files (4-byte words; virtual addresses up to 4GB) supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
 <span id="L41" class="LineNr"> 41 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents[<span class="Constant">5</span>] != <span class="Constant">1</span><span class="Delimiter">)</span>
-<span id="L42" class="LineNr"> 42 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Only little-endian ELF files supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
+<span id="L42" class="LineNr"> 42 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Only little-endian ELF files supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
 <span id="L43" class="LineNr"> 43 </span>  <span class="Comment">// unused: remaining 10 bytes of e_ident</span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Normal">uint32_t</span> e_machine_type = <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">16</span>]<span class="Delimiter">);</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="Normal">uint32_t</span> e_machine_type = <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">16</span>]<span class="Delimiter">);</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_machine_type != <span class="Constant">0x00030002</span><span class="Delimiter">)</span>
 <span id="L46" class="LineNr"> 46 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;ELF type/machine 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; e_machine_type &lt;&lt; <span class="Constant">&quot; isn't i386 executable</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Comment">// unused: e_version. We only support version 1, and later versions will be backwards compatible.</span>
-<span id="L48" class="LineNr"> 48 </span>  <span class="Normal">uint32_t</span> e_entry = <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">24</span>]<span class="Delimiter">);</span>
-<span id="L49" class="LineNr"> 49 </span>  <span class="Normal">uint32_t</span> e_phoff = <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">28</span>]<span class="Delimiter">);</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="Normal">uint32_t</span> e_entry = <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">24</span>]<span class="Delimiter">);</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="Normal">uint32_t</span> e_phoff = <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">28</span>]<span class="Delimiter">);</span>
 <span id="L50" class="LineNr"> 50 </span>  <span class="Comment">// unused: e_shoff</span>
 <span id="L51" class="LineNr"> 51 </span>  <span class="Comment">// unused: e_flags</span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="Normal">uint32_t</span> e_ehsize = <a href='012elf.cc.html#L116'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">40</span>]<span class="Delimiter">);</span>
-<span id="L53" class="LineNr"> 53 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &lt; <span class="Constant">52</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; ELF header too small</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
-<span id="L54" class="LineNr"> 54 </span>  <span class="Normal">uint32_t</span> e_phentsize = <a href='012elf.cc.html#L116'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">42</span>]<span class="Delimiter">);</span>
-<span id="L55" class="LineNr"> 55 </span>  <span class="Normal">uint32_t</span> e_phnum = <a href='012elf.cc.html#L116'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">44</span>]<span class="Delimiter">);</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Normal">uint32_t</span> e_ehsize = <a href='012elf.cc.html#L139'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">40</span>]<span class="Delimiter">);</span>
+<span id="L53" class="LineNr"> 53 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &lt; <span class="Constant">52</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; ELF header too small</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="Normal">uint32_t</span> e_phentsize = <a href='012elf.cc.html#L139'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">42</span>]<span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="Normal">uint32_t</span> e_phnum = <a href='012elf.cc.html#L139'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">44</span>]<span class="Delimiter">);</span>
 <span id="L56" class="LineNr"> 56 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; e_phnum &lt;&lt; <span class="Constant">&quot; entries in the <a href='011run.cc.html#L96'>program</a> header, each &quot;</span> &lt;&lt; e_phentsize &lt;&lt; <span class="Constant">&quot; bytes long&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L57" class="LineNr"> 57 </span>  <span class="Comment">// unused: e_shentsize</span>
 <span id="L58" class="LineNr"> 58 </span>  <span class="Comment">// unused: e_shnum</span>
 <span id="L59" class="LineNr"> 59 </span>  <span class="Comment">// unused: e_shstrndx</span>
 <span id="L60" class="LineNr"> 60 </span>
 <span id="L61" class="LineNr"> 61 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; e_phnum<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span>
-<span id="L62" class="LineNr"> 62 </span>    <a href='012elf.cc.html#L70'>load_segment_from_program_header</a><span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">,</span> e_phoff + i*e_phentsize<span class="Delimiter">,</span> e_ehsize<span class="Delimiter">);</span>
+<span id="L62" class="LineNr"> 62 </span>    <a href='012elf.cc.html#L92'>load_segment_from_program_header</a><span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">,</span> e_phoff + i*e_phentsize<span class="Delimiter">,</span> e_ehsize<span class="Delimiter">);</span>
 <span id="L63" class="LineNr"> 63 </span>
 <span id="L64" class="LineNr"> 64 </span>  <span class="Comment">// initialize code and stack</span>
-<span id="L65" class="LineNr"> 65 </span>  Reg[ESP]<span class="Delimiter">.</span>u = <a href='012elf.cc.html#L106'>AFTER_STACK</a><span class="Delimiter">;</span>
+<span id="L65" class="LineNr"> 65 </span>  Reg[ESP]<span class="Delimiter">.</span>u = <a href='012elf.cc.html#L128'>AFTER_STACK</a><span class="Delimiter">;</span>
 <span id="L66" class="LineNr"> 66 </span>  Reg[EBP]<span class="Delimiter">.</span>u = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L67" class="LineNr"> 67 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = e_entry<span class="Delimiter">;</span>
-<span id="L68" class="LineNr"> 68 </span><span class="Delimiter">}</span>
-<span id="L69" class="LineNr"> 69 </span>
-<span id="L70" class="LineNr"> 70 </span><span class="Normal">void</span> <a href='012elf.cc.html#L70'>load_segment_from_program_header</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* elf_contents<span class="Delimiter">,</span> <span class="Normal">size_t</span> size<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> offset<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> e_ehsize<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L71" class="LineNr"> 71 </span>  <span class="Normal">uint32_t</span> p_type = <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset]<span class="Delimiter">);</span>
-<span id="L72" class="LineNr"> 72 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;program header at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot;: type &quot;</span> &lt;&lt; p_type &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L73" class="LineNr"> 73 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_type != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L74" class="LineNr"> 74 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ignoring segment at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; of non PT_LOAD type &quot;</span> &lt;&lt; p_type &lt;&lt; <span class="Constant">&quot; (see <a href="http://refspecs.linuxbase.org/elf/elf.pdf">http://refspecs.linuxbase.org/elf/elf.pdf</a>)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L75" class="LineNr"> 75 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L76" class="LineNr"> 76 </span>  <span class="Delimiter">}</span>
-<span id="L77" class="LineNr"> 77 </span>  <span class="Normal">uint32_t</span> p_offset = <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">4</span>]<span class="Delimiter">);</span>
-<span id="L78" class="LineNr"> 78 </span>  <span class="Normal">uint32_t</span> p_vaddr = <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">8</span>]<span class="Delimiter">);</span>
-<span id="L79" class="LineNr"> 79 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &gt; p_vaddr<span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; <a href='011run.cc.html#L96'>program</a> header overlaps ELF header</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Comment">// unused: p_paddr</span>
-<span id="L81" class="LineNr"> 81 </span>  <span class="Normal">uint32_t</span> p_filesz = <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">16</span>]<span class="Delimiter">);</span>
-<span id="L82" class="LineNr"> 82 </span>  <span class="Normal">uint32_t</span> p_memsz = <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">20</span>]<span class="Delimiter">);</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_filesz != p_memsz<span class="Delimiter">)</span>
-<span id="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Can't handle segments where p_filesz != p_memsz (see <a href="http://refspecs.linuxbase.org/elf/elf.pdf">http://refspecs.linuxbase.org/elf/elf.pdf</a>)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
-<span id="L85" class="LineNr"> 85 </span>
-<span id="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_offset + p_filesz &gt; size<span class="Delimiter">)</span>
-<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; segment at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; is too large: wants to <a href='003trace.cc.html#L222'>end</a> at &quot;</span> &lt;&lt; p_offset+p_filesz &lt;&lt; <span class="Constant">&quot; but the file ends at &quot;</span> &lt;&lt; size &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L130'>die</a><span class="Delimiter">();</span>
-<span id="L88" class="LineNr"> 88 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>size<span class="Delimiter">()</span> &lt; p_vaddr + p_memsz<span class="Delimiter">)</span>
-<span id="L89" class="LineNr"> 89 </span>    <a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span>p_vaddr + p_memsz<span class="Delimiter">);</span>
-<span id="L90" class="LineNr"> 90 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size &gt; p_memsz<span class="Delimiter">)</span> size = p_memsz<span class="Delimiter">;</span>
-<span id="L91" class="LineNr"> 91 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;blitting file offsets (&quot;</span> &lt;&lt; p_offset &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_offset+p_filesz<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;) to addresses (&quot;</span> &lt;&lt; p_vaddr &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_vaddr+p_memsz<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L92" class="LineNr"> 92 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; p_filesz<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span>
-<span id="L93" class="LineNr"> 93 </span>    <a href='010---vm.cc.html#L133'>write_mem_u8</a><span class="Delimiter">(</span>p_vaddr+i<span class="Delimiter">,</span> elf_contents[p_offset+i]<span class="Delimiter">);</span>
-<span id="L94" class="LineNr"> 94 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L95'>End_of_program</a> &lt; p_vaddr+p_memsz<span class="Delimiter">)</span>
-<span id="L95" class="LineNr"> 95 </span>    <a href='010---vm.cc.html#L95'>End_of_program</a> = p_vaddr+p_memsz<span class="Delimiter">;</span>
-<span id="L96" class="LineNr"> 96 </span><span class="Delimiter">}</span>
-<span id="L97" class="LineNr"> 97 </span>
-<span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L99" class="LineNr"> 99 </span><span class="Comment">// Very primitive/fixed/insecure ELF segments for now.</span>
-<span id="L100" class="LineNr">100 </span><span class="Comment">//   code: 0x08048000 -&gt; 0x08048fff</span>
-<span id="L101" class="LineNr">101 </span><span class="Comment">//   data: 0x08049000 -&gt; 0x08049fff</span>
-<span id="L102" class="LineNr">102 </span><span class="Comment">//   heap: 0x0804a000 -&gt; 0x0804afff</span>
-<span id="L103" class="LineNr">103 </span><span class="Comment">//   stack: 0x0804bfff -&gt; 0x0804b000 (downward)</span>
-<span id="L104" class="LineNr">104 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L104'>CODE_START</a> = <span class="Constant">0x08048000</span><span class="Delimiter">;</span>
-<span id="L105" class="LineNr">105 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L105'>SEGMENT_SIZE</a> = <span class="Constant">0x1000</span><span class="Delimiter">;</span>
-<span id="L106" class="LineNr">106 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L106'>AFTER_STACK</a> = <span class="Constant">0x0804c000</span><span class="Delimiter">;</span>
-<span id="L107" class="LineNr">107 </span><span class="Delimiter">:(code)</span>
-<span id="L108" class="LineNr">108 </span><span class="Normal">void</span> <a href='012elf.cc.html#L108'>initialize_mem</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L109" class="LineNr">109 </span>  <a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><a href='012elf.cc.html#L106'>AFTER_STACK</a> - <a href='012elf.cc.html#L104'>CODE_START</a><span class="Delimiter">);</span>
-<span id="L110" class="LineNr">110 </span><span class="Delimiter">}</span>
-<span id="L111" class="LineNr">111 </span>
-<span id="L112" class="LineNr">112 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span> <a href='012elf.cc.html#L112'>u32_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L113" class="LineNr">113 </span>  <span class="Identifier">return</span> p[<span class="Constant">0</span>] | p[<span class="Constant">1</span>] &lt;&lt; <span class="Constant">8</span> | p[<span class="Constant">2</span>] &lt;&lt; <span class="Constant">16</span> | p[<span class="Constant">3</span>] &lt;&lt; <span class="Constant">24</span><span class="Delimiter">;</span>
-<span id="L114" class="LineNr">114 </span><span class="Delimiter">}</span>
-<span id="L115" class="LineNr">115 </span>
-<span id="L116" class="LineNr">116 </span><span class="Normal">inline</span> <span class="Normal">uint16_t</span> <a href='012elf.cc.html#L116'>u16_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L117" class="LineNr">117 </span>  <span class="Identifier">return</span> p[<span class="Constant">0</span>] | p[<span class="Constant">1</span>] &lt;&lt; <span class="Constant">8</span><span class="Delimiter">;</span>
+<span id="L68" class="LineNr"> 68 </span>
+<span id="L69" class="LineNr"> 69 </span>  <span class="Comment">// initialize args on stack</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="Comment">// no envp for now</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="Comment">// we wastefully use a separate page of memory for argv</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Normal">uint32_t</span> argv_data = <a href='012elf.cc.html#L129'>ARGV_DATA_SEGMENT</a><span class="Delimiter">;</span>
+<span id="L73" class="LineNr"> 73 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = argc-<span class="Constant">1</span><span class="Delimiter">;</span>  i &gt;= <span class="Comment">/*</span><span class="Comment">skip 'subx_bin' and 'run'</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">;</span>  --i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L74" class="LineNr"> 74 </span>    <a href='003trace.cc.html#L199'>dbg</a> &lt;&lt; <span class="Constant">&quot;push &quot;</span> &lt;&lt; argv_data &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L75" class="LineNr"> 75 </span>    <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span>argv_data<span class="Delimiter">);</span>
+<span id="L76" class="LineNr"> 76 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt;= strlen<span class="Delimiter">(</span>argv[i]<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L77" class="LineNr"> 77 </span>      <a href='010---vm.cc.html#L133'>write_mem_u8</a><span class="Delimiter">(</span>argv_data<span class="Delimiter">,</span> argv[i][j]<span class="Delimiter">);</span>
+<span id="L78" class="LineNr"> 78 </span>      argv_data += <span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">char</span><span class="Delimiter">);</span>
+<span id="L79" class="LineNr"> 79 </span>      assert<span class="Delimiter">(</span>argv_data &lt; <a href='012elf.cc.html#L129'>ARGV_DATA_SEGMENT</a> + <a href='012elf.cc.html#L127'>SEGMENT_SIZE</a><span class="Delimiter">);</span>
+<span id="L80" class="LineNr"> 80 </span>    <span class="Delimiter">}</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Delimiter">}</span>
+<span id="L82" class="LineNr"> 82 </span>  <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span>argc-<span class="Comment">/*</span><span class="Comment">skip 'subx_bin' and 'run'</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L83" class="LineNr"> 83 </span><span class="Delimiter">}</span>
+<span id="L84" class="LineNr"> 84 </span>
+<span id="L85" class="LineNr"> 85 </span><span class="Normal">void</span> <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L86" class="LineNr"> 86 </span>  Reg[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L87" class="LineNr"> 87 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L88" class="LineNr"> 88 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pushing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L89" class="LineNr"> 89 </span>  <a href='010---vm.cc.html#L139'>write_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
+<span id="L90" class="LineNr"> 90 </span><span class="Delimiter">}</span>
+<span id="L91" class="LineNr"> 91 </span>
+<span id="L92" class="LineNr"> 92 </span><span class="Normal">void</span> <a href='012elf.cc.html#L92'>load_segment_from_program_header</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* elf_contents<span class="Delimiter">,</span> <span class="Normal">size_t</span> size<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> offset<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> e_ehsize<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Normal">uint32_t</span> p_type = <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset]<span class="Delimiter">);</span>
+<span id="L94" class="LineNr"> 94 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;program header at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot;: type &quot;</span> &lt;&lt; p_type &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_type != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L96" class="LineNr"> 96 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ignoring segment at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; of non PT_LOAD type &quot;</span> &lt;&lt; p_type &lt;&lt; <span class="Constant">&quot; (see <a href="http://refspecs.linuxbase.org/elf/elf.pdf)">http://refspecs.linuxbase.org/elf/elf.pdf)</a>&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L97" class="LineNr"> 97 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="Delimiter">}</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="Normal">uint32_t</span> p_offset = <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">4</span>]<span class="Delimiter">);</span>
+<span id="L100" class="LineNr">100 </span>  <span class="Normal">uint32_t</span> p_vaddr = <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">8</span>]<span class="Delimiter">);</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &gt; p_vaddr<span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; <a href='011run.cc.html#L96'>program</a> header overlaps ELF header</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Comment">// unused: p_paddr</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Normal">uint32_t</span> p_filesz = <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">16</span>]<span class="Delimiter">);</span>
+<span id="L104" class="LineNr">104 </span>  <span class="Normal">uint32_t</span> p_memsz = <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">20</span>]<span class="Delimiter">);</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_filesz != p_memsz<span class="Delimiter">)</span>
+<span id="L106" class="LineNr">106 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Can't handle segments where p_filesz != p_memsz (see <a href="http://refspecs.linuxbase.org/elf/elf.pdf)">http://refspecs.linuxbase.org/elf/elf.pdf)</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
+<span id="L107" class="LineNr">107 </span>
+<span id="L108" class="LineNr">108 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_offset + p_filesz &gt; size<span class="Delimiter">)</span>
+<span id="L109" class="LineNr">109 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; segment at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; is too large: wants to <a href='003trace.cc.html#L222'>end</a> at &quot;</span> &lt;&lt; p_offset+p_filesz &lt;&lt; <span class="Constant">&quot; but the file ends at &quot;</span> &lt;&lt; size &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
+<span id="L110" class="LineNr">110 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>size<span class="Delimiter">()</span> &lt; p_vaddr + p_memsz<span class="Delimiter">)</span>
+<span id="L111" class="LineNr">111 </span>    <a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span>p_vaddr + p_memsz<span class="Delimiter">);</span>
+<span id="L112" class="LineNr">112 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size &gt; p_memsz<span class="Delimiter">)</span> size = p_memsz<span class="Delimiter">;</span>
+<span id="L113" class="LineNr">113 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;blitting file offsets (&quot;</span> &lt;&lt; p_offset &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_offset+p_filesz<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;) to addresses (&quot;</span> &lt;&lt; p_vaddr &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_vaddr+p_memsz<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; p_filesz<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span>
+<span id="L115" class="LineNr">115 </span>    <a href='010---vm.cc.html#L133'>write_mem_u8</a><span class="Delimiter">(</span>p_vaddr+i<span class="Delimiter">,</span> elf_contents[p_offset+i]<span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L95'>End_of_program</a> &lt; p_vaddr+p_memsz<span class="Delimiter">)</span>
+<span id="L117" class="LineNr">117 </span>    <a href='010---vm.cc.html#L95'>End_of_program</a> = p_vaddr+p_memsz<span class="Delimiter">;</span>
 <span id="L118" class="LineNr">118 </span><span class="Delimiter">}</span>
 <span id="L119" class="LineNr">119 </span>
-<span id="L120" class="LineNr">120 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L121" class="LineNr">121 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L121'>perr</a> <span class="Delimiter">{};</span>
-<span id="L122" class="LineNr">122 </span><span class="Delimiter">:(code)</span>
-<span id="L123" class="LineNr">123 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> <a href='012elf.cc.html#L121'>perr</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L124" class="LineNr">124 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>errno<span class="Delimiter">)</span>
-<span id="L125" class="LineNr">125 </span>    os &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">);</span>
-<span id="L126" class="LineNr">126 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
-<span id="L127" class="LineNr">127 </span><span class="Delimiter">}</span>
-<span id="L128" class="LineNr">128 </span>
-<span id="L129" class="LineNr">129 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L130" class="LineNr">130 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L130'>die</a> <span class="Delimiter">{};</span>
-<span id="L131" class="LineNr">131 </span><span class="Delimiter">:(code)</span>
-<span id="L132" class="LineNr">132 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">,</span> <a href='012elf.cc.html#L130'>die</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L133" class="LineNr">133 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span>
-<span id="L134" class="LineNr">134 </span>  exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L135" class="LineNr">135 </span><span class="Delimiter">}</span>
-<span id="L136" class="LineNr">136 </span>
-<span id="L137" class="LineNr">137 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L138" class="LineNr">138 </span><span class="Comment">#include &lt;sys/types.h&gt;</span>
-<span id="L139" class="LineNr">139 </span><span class="Comment">#include &lt;sys/stat.h&gt;</span>
-<span id="L140" class="LineNr">140 </span><span class="Comment">#include &lt;fcntl.h&gt;</span>
-<span id="L141" class="LineNr">141 </span><span class="Comment">#include &lt;stdarg.h&gt;</span>
-<span id="L142" class="LineNr">142 </span><span class="Comment">#include &lt;errno.h&gt;</span>
-<span id="L143" class="LineNr">143 </span><span class="Comment">#include &lt;unistd.h&gt;</span>
+<span id="L120" class="LineNr">120 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L121" class="LineNr">121 </span><span class="Comment">// Very primitive/fixed/insecure ELF segments for now.</span>
+<span id="L122" class="LineNr">122 </span><span class="Comment">//   code: 0x08048000 -&gt; 0x08048fff</span>
+<span id="L123" class="LineNr">123 </span><span class="Comment">//   data: 0x08049000 -&gt; 0x08049fff</span>
+<span id="L124" class="LineNr">124 </span><span class="Comment">//   heap: 0x0804a000 -&gt; 0x0804afff</span>
+<span id="L125" class="LineNr">125 </span><span class="Comment">//   stack: 0x0804bfff -&gt; 0x0804b000 (downward)</span>
+<span id="L126" class="LineNr">126 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L126'>CODE_START</a> = <span class="Constant">0x08048000</span><span class="Delimiter">;</span>
+<span id="L127" class="LineNr">127 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L127'>SEGMENT_SIZE</a> = <span class="Constant">0x1000</span><span class="Delimiter">;</span>
+<span id="L128" class="LineNr">128 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L128'>AFTER_STACK</a> = <span class="Constant">0x0804c000</span><span class="Delimiter">;</span>
+<span id="L129" class="LineNr">129 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L129'>ARGV_DATA_SEGMENT</a> = <span class="Constant">0x0804e000</span><span class="Delimiter">;</span>
+<span id="L130" class="LineNr">130 </span><span class="Delimiter">:(code)</span>
+<span id="L131" class="LineNr">131 </span><span class="Normal">void</span> <a href='012elf.cc.html#L131'>initialize_mem</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L132" class="LineNr">132 </span>  <a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><a href='012elf.cc.html#L128'>AFTER_STACK</a> - <a href='012elf.cc.html#L126'>CODE_START</a><span class="Delimiter">);</span>
+<span id="L133" class="LineNr">133 </span><span class="Delimiter">}</span>
+<span id="L134" class="LineNr">134 </span>
+<span id="L135" class="LineNr">135 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span> <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L136" class="LineNr">136 </span>  <span class="Identifier">return</span> p[<span class="Constant">0</span>] | p[<span class="Constant">1</span>] &lt;&lt; <span class="Constant">8</span> | p[<span class="Constant">2</span>] &lt;&lt; <span class="Constant">16</span> | p[<span class="Constant">3</span>] &lt;&lt; <span class="Constant">24</span><span class="Delimiter">;</span>
+<span id="L137" class="LineNr">137 </span><span class="Delimiter">}</span>
+<span id="L138" class="LineNr">138 </span>
+<span id="L139" class="LineNr">139 </span><span class="Normal">inline</span> <span class="Normal">uint16_t</span> <a href='012elf.cc.html#L139'>u16_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L140" class="LineNr">140 </span>  <span class="Identifier">return</span> p[<span class="Constant">0</span>] | p[<span class="Constant">1</span>] &lt;&lt; <span class="Constant">8</span><span class="Delimiter">;</span>
+<span id="L141" class="LineNr">141 </span><span class="Delimiter">}</span>
+<span id="L142" class="LineNr">142 </span>
+<span id="L143" class="LineNr">143 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L144" class="LineNr">144 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L144'>perr</a> <span class="Delimiter">{};</span>
+<span id="L145" class="LineNr">145 </span><span class="Delimiter">:(code)</span>
+<span id="L146" class="LineNr">146 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> <a href='012elf.cc.html#L144'>perr</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L147" class="LineNr">147 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>errno<span class="Delimiter">)</span>
+<span id="L148" class="LineNr">148 </span>    os &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">);</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Identifier">return</span> os<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="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L153" class="LineNr">153 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L153'>die</a> <span class="Delimiter">{};</span>
+<span id="L154" class="LineNr">154 </span><span class="Delimiter">:(code)</span>
+<span id="L155" class="LineNr">155 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">,</span> <a href='012elf.cc.html#L153'>die</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span>
+<span id="L157" class="LineNr">157 </span>  exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L158" class="LineNr">158 </span><span class="Delimiter">}</span>
+<span id="L159" class="LineNr">159 </span>
+<span id="L160" class="LineNr">160 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L161" class="LineNr">161 </span><span class="Comment">#include &lt;sys/types.h&gt;</span>
+<span id="L162" class="LineNr">162 </span><span class="Comment">#include &lt;sys/stat.h&gt;</span>
+<span id="L163" class="LineNr">163 </span><span class="Comment">#include &lt;fcntl.h&gt;</span>
+<span id="L164" class="LineNr">164 </span><span class="Comment">#include &lt;stdarg.h&gt;</span>
+<span id="L165" class="LineNr">165 </span><span class="Comment">#include &lt;errno.h&gt;</span>
+<span id="L166" class="LineNr">166 </span><span class="Comment">#include &lt;unistd.h&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/013direct_addressing.cc.html b/html/subx/013direct_addressing.cc.html
index 69e32bc5..7aee7484 100644
--- a/html/subx/013direct_addressing.cc.html
+++ b/html/subx/013direct_addressing.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/013direct_addressing.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
-.CommentedCode { color: #6c6c6c; }
-.LineNr { color: #444444; }
+.cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 .Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
+.SalientComment { color: #00ffff; }
 .Delimiter { color: #800080; }
+.Special { color: #c00000; }
+.Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.Identifier { color: #c0a020; }
+.CommentedCode { color: #6c6c6c; }
 .PreProc { color: #800080; }
 -->
 </style>
@@ -413,7 +413,7 @@ if ('onhashchange' in window) {
 <span id="L348" class="LineNr">348 </span>== <span class="Constant">0x1</span>
 <span id="L349" class="LineNr">349 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L350" class="LineNr">350 </span>  <span class="Constant">53</span>                                          <span class="Comment"># push EBX to stack</span>
-<span id="L351" class="LineNr">351 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L371'>push</a> <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L351" class="LineNr">351 </span><span class="traceContains">+run: <a href='012elf.cc.html#L85'>push</a> <a href='010---vm.cc.html#L16'>EBX</a></span>
 <span id="L352" class="LineNr">352 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span>
 <span id="L353" class="LineNr">353 </span><span class="traceContains">+run: pushing value 0x0000000a</span>
 <span id="L354" class="LineNr">354 </span>
@@ -429,65 +429,58 @@ if ('onhashchange' in window) {
 <span id="L364" class="LineNr">364 </span>  <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
 <span id="L365" class="LineNr">365 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L366" class="LineNr">366 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: &quot; &lt;&lt; NUM(reg) &lt;&lt; &quot;: &quot; &lt;&lt; Reg[reg].u &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
-<span id="L367" class="LineNr">367 </span>  <a href='013direct_addressing.cc.html#L371'>push</a><span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L367" class="LineNr">367 </span>  <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L368" class="LineNr">368 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L369" class="LineNr">369 </span><span class="Delimiter">}</span>
-<span id="L370" class="LineNr">370 </span><span class="Delimiter">:(code)</span>
-<span id="L371" class="LineNr">371 </span><span class="Normal">void</span> <a href='013direct_addressing.cc.html#L371'>push</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L372" class="LineNr">372 </span>  Reg[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L373" class="LineNr">373 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L374" class="LineNr">374 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pushing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L375" class="LineNr">375 </span>  <a href='010---vm.cc.html#L139'>write_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
-<span id="L376" class="LineNr">376 </span><span class="Delimiter">}</span>
-<span id="L377" class="LineNr">377 </span>
-<span id="L378" class="LineNr">378 </span><span class="SalientComment">//:: pop</span>
-<span id="L379" class="LineNr">379 </span>
-<span id="L380" class="LineNr">380 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L381" class="LineNr">381 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L382" class="LineNr">382 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R1 (ECX)&quot;</span><span class="Delimiter">);</span>
-<span id="L383" class="LineNr">383 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R2 (EDX)&quot;</span><span class="Delimiter">);</span>
-<span id="L384" class="LineNr">384 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R3 (EBX)&quot;</span><span class="Delimiter">);</span>
-<span id="L385" class="LineNr">385 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R4 (ESP)&quot;</span><span class="Delimiter">);</span>
-<span id="L386" class="LineNr">386 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R5 (EBP)&quot;</span><span class="Delimiter">);</span>
-<span id="L387" class="LineNr">387 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R6 (ESI)&quot;</span><span class="Delimiter">);</span>
-<span id="L388" class="LineNr">388 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R7 (EDI)&quot;</span><span class="Delimiter">);</span>
-<span id="L389" class="LineNr">389 </span>
-<span id="L390" class="LineNr">390 </span><span class="Delimiter">:(scenario pop_r32)</span>
-<span id="L391" class="LineNr">391 </span><span class="Special">% Reg[ESP].u = 0x60;</span>
-<span id="L392" class="LineNr">392 </span><span class="Special">% write_mem_i32(0x60, 0x0000000a);</span>
-<span id="L393" class="LineNr">393 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L394" class="LineNr">394 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L395" class="LineNr">395 </span>  5b                                          <span class="Comment"># pop stack to EBX</span>
-<span id="L396" class="LineNr">396 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L397" class="LineNr">397 </span>0a <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0x0a</span>
-<span id="L398" class="LineNr">398 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L419'>pop</a> into <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L399" class="LineNr">399 </span><span class="traceContains">+run: popping value 0x0000000a</span>
-<span id="L400" class="LineNr">400 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000064</span>
-<span id="L401" class="LineNr">401 </span>
-<span id="L402" class="LineNr">402 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L403" class="LineNr">403 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
-<span id="L404" class="LineNr">404 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
-<span id="L405" class="LineNr">405 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
-<span id="L406" class="LineNr">406 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
-<span id="L407" class="LineNr">407 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
-<span id="L408" class="LineNr">408 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
-<span id="L409" class="LineNr">409 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
-<span id="L410" class="LineNr">410 </span><span class="Normal">case</span> <span class="Constant">0x5f</span>: <span class="Delimiter">{</span>  <span class="Comment">// pop stack into r32</span>
-<span id="L411" class="LineNr">411 </span>  <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L412" class="LineNr">412 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L413" class="LineNr">413 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;pop from &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
-<span id="L414" class="LineNr">414 </span>  Reg[reg]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L419'>pop</a><span class="Delimiter">();</span>
-<span id="L415" class="LineNr">415 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;=&gt; &quot; &lt;&lt; NUM(reg) &lt;&lt; &quot;: &quot; &lt;&lt; Reg[reg].u &lt;&lt; '\n';</span>
-<span id="L416" class="LineNr">416 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L417" class="LineNr">417 </span><span class="Delimiter">}</span>
-<span id="L418" class="LineNr">418 </span><span class="Delimiter">:(code)</span>
-<span id="L419" class="LineNr">419 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L419'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L420" class="LineNr">420 </span>  <span class="Normal">uint32_t</span> result = <a href='010---vm.cc.html#L110'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L421" class="LineNr">421 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;popping value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L422" class="LineNr">422 </span>  Reg[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L423" class="LineNr">423 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L424" class="LineNr">424 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L425" class="LineNr">425 </span><span class="Delimiter">}</span>
+<span id="L370" class="LineNr">370 </span>
+<span id="L371" class="LineNr">371 </span><span class="SalientComment">//:: pop</span>
+<span id="L372" class="LineNr">372 </span>
+<span id="L373" class="LineNr">373 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L374" class="LineNr">374 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L375" class="LineNr">375 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R1 (ECX)&quot;</span><span class="Delimiter">);</span>
+<span id="L376" class="LineNr">376 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R2 (EDX)&quot;</span><span class="Delimiter">);</span>
+<span id="L377" class="LineNr">377 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R3 (EBX)&quot;</span><span class="Delimiter">);</span>
+<span id="L378" class="LineNr">378 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R4 (ESP)&quot;</span><span class="Delimiter">);</span>
+<span id="L379" class="LineNr">379 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R5 (EBP)&quot;</span><span class="Delimiter">);</span>
+<span id="L380" class="LineNr">380 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R6 (ESI)&quot;</span><span class="Delimiter">);</span>
+<span id="L381" class="LineNr">381 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R7 (EDI)&quot;</span><span class="Delimiter">);</span>
+<span id="L382" class="LineNr">382 </span>
+<span id="L383" class="LineNr">383 </span><span class="Delimiter">:(scenario pop_r32)</span>
+<span id="L384" class="LineNr">384 </span><span class="Special">% Reg[ESP].u = 0x60;</span>
+<span id="L385" class="LineNr">385 </span><span class="Special">% write_mem_i32(0x60, 0x0000000a);</span>
+<span id="L386" class="LineNr">386 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L387" class="LineNr">387 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L388" class="LineNr">388 </span>  5b                                          <span class="Comment"># pop stack to EBX</span>
+<span id="L389" class="LineNr">389 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L390" class="LineNr">390 </span>0a <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0x0a</span>
+<span id="L391" class="LineNr">391 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L412'>pop</a> into <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L392" class="LineNr">392 </span><span class="traceContains">+run: popping value 0x0000000a</span>
+<span id="L393" class="LineNr">393 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000064</span>
+<span id="L394" class="LineNr">394 </span>
+<span id="L395" class="LineNr">395 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L396" class="LineNr">396 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
+<span id="L397" class="LineNr">397 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
+<span id="L398" class="LineNr">398 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
+<span id="L399" class="LineNr">399 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
+<span id="L400" class="LineNr">400 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
+<span id="L401" class="LineNr">401 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
+<span id="L402" class="LineNr">402 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
+<span id="L403" class="LineNr">403 </span><span class="Normal">case</span> <span class="Constant">0x5f</span>: <span class="Delimiter">{</span>  <span class="Comment">// pop stack into r32</span>
+<span id="L404" class="LineNr">404 </span>  <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L405" class="LineNr">405 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L406" class="LineNr">406 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;pop from &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
+<span id="L407" class="LineNr">407 </span>  Reg[reg]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L412'>pop</a><span class="Delimiter">();</span>
+<span id="L408" class="LineNr">408 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;=&gt; &quot; &lt;&lt; NUM(reg) &lt;&lt; &quot;: &quot; &lt;&lt; Reg[reg].u &lt;&lt; '\n';</span>
+<span id="L409" class="LineNr">409 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L410" class="LineNr">410 </span><span class="Delimiter">}</span>
+<span id="L411" class="LineNr">411 </span><span class="Delimiter">:(code)</span>
+<span id="L412" class="LineNr">412 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L412'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L413" class="LineNr">413 </span>  <span class="Normal">uint32_t</span> result = <a href='010---vm.cc.html#L110'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L414" class="LineNr">414 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;popping value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L415" class="LineNr">415 </span>  Reg[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L416" class="LineNr">416 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L417" class="LineNr">417 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L418" class="LineNr">418 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/014indirect_addressing.cc.html b/html/subx/014indirect_addressing.cc.html
index 43b9e5be..79362ee9 100644
--- a/html/subx/014indirect_addressing.cc.html
+++ b/html/subx/014indirect_addressing.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/014indirect_addressing.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
+.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
 .traceAbsent { color: #c00000; }
+.Constant { color: #00a0a0; }
 .SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .PreProc { color: #800080; }
-.traceContains { color: #008000; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
 -->
 </style>
 
@@ -427,7 +427,7 @@ if ('onhashchange' in window) {
 <span id="L363" class="LineNr">363 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
 <span id="L364" class="LineNr">364 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L365" class="LineNr">365 </span>  8b  <span class="Constant">18</span>                                      <span class="Comment"># copy *EAX to EBX</span>
-<span id="L366" class="LineNr">366 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L366" class="LineNr">366 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 000 (dest EAX)</span>
 <span id="L367" class="LineNr">367 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
 <span id="L368" class="LineNr">368 </span>af <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0xaf</span>
 <span id="L369" class="LineNr">369 </span><span class="traceContains">+run: copy r/m32 to <a href='010---vm.cc.html#L16'>EBX</a></span>
@@ -445,212 +445,271 @@ if ('onhashchange' in window) {
 <span id="L381" class="LineNr">381 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L382" class="LineNr">382 </span><span class="Delimiter">}</span>
 <span id="L383" class="LineNr">383 </span>
-<span id="L384" class="LineNr">384 </span><span class="SalientComment">//:: jump</span>
+<span id="L384" class="LineNr">384 </span><span class="Comment">//:</span>
 <span id="L385" class="LineNr">385 </span>
 <span id="L386" class="LineNr">386 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L387" class="LineNr">387 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump/push/call rm32 based on subop&quot;</span><span class="Delimiter">);</span>
+<span id="L387" class="LineNr">387 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;88&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r8 (lowermost byte of r32) to r8/m8-at-r32&quot;</span><span class="Delimiter">);</span>
 <span id="L388" class="LineNr">388 </span>
-<span id="L389" class="LineNr">389 </span><span class="Delimiter">:(scenario jump_mem_at_r32)</span>
-<span id="L390" class="LineNr">390 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L391" class="LineNr">391 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L392" class="LineNr">392 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L393" class="LineNr">393 </span>  ff  <span class="Constant">20</span>                                      <span class="Comment"># jump to *EAX</span>
-<span id="L394" class="LineNr">394 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 100 (jump to r/m32) 000 (src EAX)</span>
-<span id="L395" class="LineNr">395 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
-<span id="L396" class="LineNr">396 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
-<span id="L397" class="LineNr">397 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L398" class="LineNr">398 </span><span class="Error">08</span> <span class="PreProc">0</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"># 8</span>
-<span id="L399" class="LineNr">399 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L400" class="LineNr">400 </span><span class="traceContains">+run: jump to r/m32</span>
-<span id="L401" class="LineNr">401 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L402" class="LineNr">402 </span><span class="traceContains">+run: jumping to 0x00000008</span>
-<span id="L403" class="LineNr">403 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L404" class="LineNr">404 </span><span class="traceAbsent">-run: inst: 0x00000003</span>
-<span id="L405" class="LineNr">405 </span>
-<span id="L406" class="LineNr">406 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L407" class="LineNr">407 </span><span class="Normal">case</span> <span class="Constant">0xff</span>: <span class="Delimiter">{</span>
-<span id="L408" class="LineNr">408 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L409" class="LineNr">409 </span>  <span class="Normal">uint8_t</span> <a href='036recommend_labels.cc.html#L54'>subop</a> = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
-<span id="L410" class="LineNr">410 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span><a href='036recommend_labels.cc.html#L54'>subop</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L411" class="LineNr">411 </span>    <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump to r/m32</span>
-<span id="L412" class="LineNr">412 </span>      <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L413" class="LineNr">413 </span>      <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L414" class="LineNr">414 </span>      <a href='010---vm.cc.html#L29'>EIP</a> = *arg2<span class="Delimiter">;</span>
-<span id="L415" class="LineNr">415 </span>      <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L416" class="LineNr">416 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L417" class="LineNr">417 </span>    <span class="Delimiter">}</span>
-<span id="L418" class="LineNr">418 </span>    <span class="Comment">// End Op ff Subops</span>
-<span id="L419" class="LineNr">419 </span>  <span class="Delimiter">}</span>
-<span id="L420" class="LineNr">420 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L421" class="LineNr">421 </span><span class="Delimiter">}</span>
-<span id="L422" class="LineNr">422 </span>
-<span id="L423" class="LineNr">423 </span><span class="SalientComment">//:: push</span>
-<span id="L424" class="LineNr">424 </span>
-<span id="L425" class="LineNr">425 </span><span class="Delimiter">:(scenario push_mem_at_r32)</span>
-<span id="L426" class="LineNr">426 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L427" class="LineNr">427 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
-<span id="L428" class="LineNr">428 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L429" class="LineNr">429 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L430" class="LineNr">430 </span>  ff  <span class="Constant">30</span>                                      <span class="Comment"># push *EAX to stack</span>
-<span id="L431" class="LineNr">431 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (push r/m32) 000 (src EAX)</span>
-<span id="L432" class="LineNr">432 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L433" class="LineNr">433 </span>af <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0xaf</span>
-<span id="L434" class="LineNr">434 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L371'>push</a> r/m32</span>
-<span id="L435" class="LineNr">435 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L436" class="LineNr">436 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000010</span>
-<span id="L437" class="LineNr">437 </span><span class="traceContains">+run: pushing value 0x000000af</span>
-<span id="L438" class="LineNr">438 </span>
-<span id="L439" class="LineNr">439 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
-<span id="L440" class="LineNr">440 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>  <span class="Comment">// push r/m32 to stack</span>
-<span id="L441" class="LineNr">441 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L442" class="LineNr">442 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* val = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L443" class="LineNr">443 </span>  <a href='013direct_addressing.cc.html#L371'>push</a><span class="Delimiter">(</span>*val<span class="Delimiter">);</span>
-<span id="L444" class="LineNr">444 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L445" class="LineNr">445 </span><span class="Delimiter">}</span>
-<span id="L446" class="LineNr">446 </span>
-<span id="L447" class="LineNr">447 </span><span class="SalientComment">//:: pop</span>
-<span id="L448" class="LineNr">448 </span>
-<span id="L449" class="LineNr">449 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L450" class="LineNr">450 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L451" class="LineNr">451 </span>
-<span id="L452" class="LineNr">452 </span><span class="Delimiter">:(scenario pop_mem_at_r32)</span>
-<span id="L453" class="LineNr">453 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L454" class="LineNr">454 </span><span class="Special">% Reg[ESP].u = 0x10;</span>
-<span id="L455" class="LineNr">455 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L456" class="LineNr">456 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L457" class="LineNr">457 </span>  <span class="Constant">8f</span>  <span class="PreProc">0</span><span class="Constant">0</span>                                      <span class="Comment"># pop stack into *EAX</span>
-<span id="L458" class="LineNr">458 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (pop r/m32) 000 (dest EAX)</span>
-<span id="L459" class="LineNr">459 </span>== <span class="Constant">0x10</span>  <span class="Comment"># data segment</span>
-<span id="L460" class="LineNr">460 </span><span class="Constant">30</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0x30</span>
-<span id="L461" class="LineNr">461 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L419'>pop</a> into r/m32</span>
-<span id="L462" class="LineNr">462 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L463" class="LineNr">463 </span><span class="traceContains">+run: popping value 0x00000030</span>
-<span id="L464" class="LineNr">464 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000014</span>
-<span id="L465" class="LineNr">465 </span>
-<span id="L466" class="LineNr">466 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L467" class="LineNr">467 </span><span class="Normal">case</span> <span class="Constant">0x8f</span>: <span class="Delimiter">{</span>  <span class="Comment">// pop stack into r/m32</span>
-<span id="L468" class="LineNr">468 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L469" class="LineNr">469 </span>  <span class="Normal">uint8_t</span> <a href='036recommend_labels.cc.html#L54'>subop</a> = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L470" class="LineNr">470 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span><a href='036recommend_labels.cc.html#L54'>subop</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L471" class="LineNr">471 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>
-<span id="L472" class="LineNr">472 </span>      <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L473" class="LineNr">473 </span>      <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L474" class="LineNr">474 </span>      *dest = <a href='013direct_addressing.cc.html#L419'>pop</a><span class="Delimiter">();</span>
+<span id="L389" class="LineNr">389 </span><span class="Delimiter">:(scenario copy_r8_to_mem_at_r32)</span>
+<span id="L390" class="LineNr">390 </span><span class="Special">% Reg[EBX].i = 0xafafafaf;</span>
+<span id="L391" class="LineNr">391 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L392" class="LineNr">392 </span>== <span class="Constant">0x1</span>
+<span id="L393" class="LineNr">393 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L394" class="LineNr">394 </span>  <span class="Constant">88</span>  <span class="Constant">18</span>                                      <span class="Comment"># copy just the lowermost byte of EBX to the byte at *EAX</span>
+<span id="L395" class="LineNr">395 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L396" class="LineNr">396 </span><span class="traceContains">+run: copy lowermost byte of <a href='010---vm.cc.html#L16'>EBX</a> to r8/m8-at-r32</span>
+<span id="L397" class="LineNr">397 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L398" class="LineNr">398 </span><span class="traceContains">+run: storing 0xaf</span>
+<span id="L399" class="LineNr">399 </span><span class="Special">% CHECK_EQ(0x000000af, read_mem_u32(0x60));</span>
+<span id="L400" class="LineNr">400 </span>
+<span id="L401" class="LineNr">401 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L402" class="LineNr">402 </span><span class="Normal">case</span> <span class="Constant">0x88</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r/m8 to r8</span>
+<span id="L403" class="LineNr">403 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L404" class="LineNr">404 </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="L405" class="LineNr">405 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy lowermost byte of &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r8/m8-at-r32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L406" class="LineNr">406 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
+<span id="L407" class="LineNr">407 </span>  <span class="Normal">uint8_t</span>* arg1 = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
+<span id="L408" class="LineNr">408 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L409" class="LineNr">409 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L259'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span>*arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L410" class="LineNr">410 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L411" class="LineNr">411 </span><span class="Delimiter">}</span>
+<span id="L412" class="LineNr">412 </span>
+<span id="L413" class="LineNr">413 </span><span class="Comment">//:</span>
+<span id="L414" class="LineNr">414 </span>
+<span id="L415" class="LineNr">415 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L416" class="LineNr">416 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r8/m8-at-r32 to r8 (lowermost byte of r32)&quot;</span><span class="Delimiter">);</span>
+<span id="L417" class="LineNr">417 </span>
+<span id="L418" class="LineNr">418 </span><span class="Delimiter">:(scenario copy_mem_at_r32_to_r8)</span>
+<span id="L419" class="LineNr">419 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
+<span id="L420" class="LineNr">420 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L421" class="LineNr">421 </span>== <span class="Constant">0x1</span>
+<span id="L422" class="LineNr">422 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L423" class="LineNr">423 </span>  8a  <span class="Constant">18</span>                                      <span class="Comment"># copy just the byte at *EAX to lowermost byte of EBX (clearing remaining bytes)</span>
+<span id="L424" class="LineNr">424 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (dest EBX) 000 (src EAX)</span>
+<span id="L425" class="LineNr">425 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L426" class="LineNr">426 </span>af ff ff ff  <span class="Comment"># 0xaf with more data in following bytes</span>
+<span id="L427" class="LineNr">427 </span><span class="traceContains">+run: copy r8/m8-at-r32 to lowermost byte of <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L428" class="LineNr">428 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L429" class="LineNr">429 </span><span class="traceContains">+run: storing 0xaf</span>
+<span id="L430" class="LineNr">430 </span>
+<span id="L431" class="LineNr">431 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L432" class="LineNr">432 </span><span class="Normal">case</span> <span class="Constant">0x8a</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r/m8 to r8</span>
+<span id="L433" class="LineNr">433 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L434" class="LineNr">434 </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="L435" class="LineNr">435 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy r8/m8-at-r32 to lowermost byte of &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L436" class="LineNr">436 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
+<span id="L437" class="LineNr">437 </span>  <span class="Normal">uint8_t</span>* arg2 = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
+<span id="L438" class="LineNr">438 </span>  Reg[reg1]<span class="Delimiter">.</span>u = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span>*arg2<span class="Delimiter">);</span>
+<span id="L439" class="LineNr">439 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L259'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span>*arg2<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L440" class="LineNr">440 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L441" class="LineNr">441 </span><span class="Delimiter">}</span>
+<span id="L442" class="LineNr">442 </span>
+<span id="L443" class="LineNr">443 </span><span class="SalientComment">//:: jump</span>
+<span id="L444" class="LineNr">444 </span>
+<span id="L445" class="LineNr">445 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L446" class="LineNr">446 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump/push/call rm32 based on subop&quot;</span><span class="Delimiter">);</span>
+<span id="L447" class="LineNr">447 </span>
+<span id="L448" class="LineNr">448 </span><span class="Delimiter">:(scenario jump_mem_at_r32)</span>
+<span id="L449" class="LineNr">449 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L450" class="LineNr">450 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L451" class="LineNr">451 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L452" class="LineNr">452 </span>  ff  <span class="Constant">20</span>                                      <span class="Comment"># jump to *EAX</span>
+<span id="L453" class="LineNr">453 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 100 (jump to r/m32) 000 (src EAX)</span>
+<span id="L454" class="LineNr">454 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">1</span>
+<span id="L455" class="LineNr">455 </span>  <span class="PreProc">0</span><span class="Constant">5</span>                              <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">2</span>
+<span id="L456" class="LineNr">456 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L457" class="LineNr">457 </span><span class="Error">08</span> <span class="PreProc">0</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"># 8</span>
+<span id="L458" class="LineNr">458 </span><span class="traceContains">+run: inst: 0x00000001</span>
+<span id="L459" class="LineNr">459 </span><span class="traceContains">+run: jump to r/m32</span>
+<span id="L460" class="LineNr">460 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L461" class="LineNr">461 </span><span class="traceContains">+run: jumping to 0x00000008</span>
+<span id="L462" class="LineNr">462 </span><span class="traceContains">+run: inst: 0x00000008</span>
+<span id="L463" class="LineNr">463 </span><span class="traceAbsent">-run: inst: 0x00000003</span>
+<span id="L464" class="LineNr">464 </span>
+<span id="L465" class="LineNr">465 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L466" class="LineNr">466 </span><span class="Normal">case</span> <span class="Constant">0xff</span>: <span class="Delimiter">{</span>
+<span id="L467" class="LineNr">467 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L468" class="LineNr">468 </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="L469" class="LineNr">469 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L470" class="LineNr">470 </span>    <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump to r/m32</span>
+<span id="L471" class="LineNr">471 </span>      <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L472" class="LineNr">472 </span>      <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L473" class="LineNr">473 </span>      <a href='010---vm.cc.html#L29'>EIP</a> = *arg2<span class="Delimiter">;</span>
+<span id="L474" class="LineNr">474 </span>      <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L475" class="LineNr">475 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L476" class="LineNr">476 </span>    <span class="Delimiter">}</span>
-<span id="L477" class="LineNr">477 </span>  <span class="Delimiter">}</span>
-<span id="L478" class="LineNr">478 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L479" class="LineNr">479 </span><span class="Delimiter">}</span>
-<span id="L480" class="LineNr">480 </span>
-<span id="L481" class="LineNr">481 </span><span class="SalientComment">//:: special-case for loading address from disp32 rather than register</span>
-<span id="L482" class="LineNr">482 </span>
-<span id="L483" class="LineNr">483 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_displacement)</span>
-<span id="L484" class="LineNr">484 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L485" class="LineNr">485 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L486" class="LineNr">486 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L487" class="LineNr">487 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  1d            <span class="Constant">60</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>              <span class="Comment"># add EBX to *0x60</span>
-<span id="L488" class="LineNr">488 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 101 (dest in disp32)</span>
-<span id="L489" class="LineNr">489 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L490" class="LineNr">490 </span><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"># 1</span>
-<span id="L491" class="LineNr">491 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L492" class="LineNr">492 </span><span class="traceContains">+run: effective address is 0x60 (disp32)</span>
-<span id="L493" class="LineNr">493 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L494" class="LineNr">494 </span>
-<span id="L495" class="LineNr">495 </span><span class="Delimiter">:(before &quot;End Mod 0 Special-cases(addr)&quot;)</span>
-<span id="L496" class="LineNr">496 </span><span class="Normal">case</span> <span class="Constant">5</span>:  <span class="Comment">// exception: mod 0b00 rm 0b101 =&gt; incoming disp32</span>
-<span id="L497" class="LineNr">497 </span>  addr = <a href='011run.cc.html#L292'>imm32</a><span class="Delimiter">();</span>
-<span id="L498" class="LineNr">498 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L499" class="LineNr">499 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L500" class="LineNr">500 </span>
-<span id="L501" class="LineNr">501 </span><span class="Comment">//:</span>
-<span id="L502" class="LineNr">502 </span>
-<span id="L503" class="LineNr">503 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_disp8)</span>
-<span id="L504" class="LineNr">504 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L505" class="LineNr">505 </span><span class="Special">% Reg[EAX].i = 0x5e;  // dest</span>
-<span id="L506" class="LineNr">506 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L507" class="LineNr">507 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L508" class="LineNr">508 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">58</span>            <span class="PreProc">0</span><span class="Constant">2</span>                       <span class="Comment"># add EBX to *(EAX+2)</span>
-<span id="L509" class="LineNr">509 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L510" class="LineNr">510 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L511" class="LineNr">511 </span><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"># 1</span>
-<span id="L512" class="LineNr">512 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L513" class="LineNr">513 </span><span class="traceContains">+run: effective address is initially 0x5e (EAX)</span>
-<span id="L514" class="LineNr">514 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp8)</span>
-<span id="L515" class="LineNr">515 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L516" class="LineNr">516 </span>
-<span id="L517" class="LineNr">517 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
-<span id="L518" class="LineNr">518 </span><span class="Normal">case</span> <span class="Constant">1</span>:  <span class="Comment">// indirect + disp8 addressing</span>
-<span id="L519" class="LineNr">519 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L520" class="LineNr">520 </span>  <span class="Normal">default</span>:
-<span id="L521" class="LineNr">521 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L522" class="LineNr">522 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L523" class="LineNr">523 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L524" class="LineNr">524 </span>  <span class="Comment">// End Mod 1 Special-cases(addr)</span>
-<span id="L525" class="LineNr">525 </span>  <span class="Delimiter">}</span>
-<span id="L526" class="LineNr">526 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>addr &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L527" class="LineNr">527 </span>    addr += <span class="Normal">static_cast</span>&lt;<span class="Normal">int8_t</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">());</span>
-<span id="L528" class="LineNr">528 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp8)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L529" class="LineNr">529 </span>  <span class="Delimiter">}</span>
-<span id="L530" class="LineNr">530 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L531" class="LineNr">531 </span>
-<span id="L532" class="LineNr">532 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_negative_disp8)</span>
-<span id="L533" class="LineNr">533 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L534" class="LineNr">534 </span><span class="Special">% Reg[EAX].i = 0x61;  // dest</span>
-<span id="L535" class="LineNr">535 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L536" class="LineNr">536 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L537" class="LineNr">537 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">58</span>            ff                       <span class="Comment"># add EBX to *(EAX-1)</span>
-<span id="L538" class="LineNr">538 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L539" class="LineNr">539 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L540" class="LineNr">540 </span><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"># 1</span>
-<span id="L541" class="LineNr">541 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L542" class="LineNr">542 </span><span class="traceContains">+run: effective address is initially 0x61 (EAX)</span>
-<span id="L543" class="LineNr">543 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp8)</span>
-<span id="L544" class="LineNr">544 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L545" class="LineNr">545 </span>
-<span id="L546" class="LineNr">546 </span><span class="Comment">//:</span>
-<span id="L547" class="LineNr">547 </span>
-<span id="L548" class="LineNr">548 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_disp32)</span>
-<span id="L549" class="LineNr">549 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L550" class="LineNr">550 </span><span class="Special">% Reg[EAX].i = 0x5e;  // dest</span>
-<span id="L551" class="LineNr">551 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L552" class="LineNr">552 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L553" class="LineNr">553 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">98</span>            <span class="PreProc">0</span><span class="Constant">2</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>              <span class="Comment"># add EBX to *(EAX+2)</span>
-<span id="L554" class="LineNr">554 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L555" class="LineNr">555 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L556" class="LineNr">556 </span><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"># 1</span>
-<span id="L557" class="LineNr">557 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L558" class="LineNr">558 </span><span class="traceContains">+run: effective address is initially 0x5e (EAX)</span>
-<span id="L559" class="LineNr">559 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp32)</span>
-<span id="L560" class="LineNr">560 </span><span class="traceContains">+run: storing 0x00000011</span>
+<span id="L477" class="LineNr">477 </span>    <span class="Comment">// End Op ff Subops</span>
+<span id="L478" class="LineNr">478 </span>  <span class="Delimiter">}</span>
+<span id="L479" class="LineNr">479 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L480" class="LineNr">480 </span><span class="Delimiter">}</span>
+<span id="L481" class="LineNr">481 </span>
+<span id="L482" class="LineNr">482 </span><span class="SalientComment">//:: push</span>
+<span id="L483" class="LineNr">483 </span>
+<span id="L484" class="LineNr">484 </span><span class="Delimiter">:(scenario push_mem_at_r32)</span>
+<span id="L485" class="LineNr">485 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L486" class="LineNr">486 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
+<span id="L487" class="LineNr">487 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L488" class="LineNr">488 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L489" class="LineNr">489 </span>  ff  <span class="Constant">30</span>                                      <span class="Comment"># push *EAX to stack</span>
+<span id="L490" class="LineNr">490 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (push r/m32) 000 (src EAX)</span>
+<span id="L491" class="LineNr">491 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L492" class="LineNr">492 </span>af <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0xaf</span>
+<span id="L493" class="LineNr">493 </span><span class="traceContains">+run: <a href='012elf.cc.html#L85'>push</a> r/m32</span>
+<span id="L494" class="LineNr">494 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L495" class="LineNr">495 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000010</span>
+<span id="L496" class="LineNr">496 </span><span class="traceContains">+run: pushing value 0x000000af</span>
+<span id="L497" class="LineNr">497 </span>
+<span id="L498" class="LineNr">498 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
+<span id="L499" class="LineNr">499 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>  <span class="Comment">// push r/m32 to stack</span>
+<span id="L500" class="LineNr">500 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L501" class="LineNr">501 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* val = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L502" class="LineNr">502 </span>  <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span>*val<span class="Delimiter">);</span>
+<span id="L503" class="LineNr">503 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L504" class="LineNr">504 </span><span class="Delimiter">}</span>
+<span id="L505" class="LineNr">505 </span>
+<span id="L506" class="LineNr">506 </span><span class="SalientComment">//:: pop</span>
+<span id="L507" class="LineNr">507 </span>
+<span id="L508" class="LineNr">508 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L509" class="LineNr">509 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L510" class="LineNr">510 </span>
+<span id="L511" class="LineNr">511 </span><span class="Delimiter">:(scenario pop_mem_at_r32)</span>
+<span id="L512" class="LineNr">512 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L513" class="LineNr">513 </span><span class="Special">% Reg[ESP].u = 0x10;</span>
+<span id="L514" class="LineNr">514 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L515" class="LineNr">515 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L516" class="LineNr">516 </span>  <span class="Constant">8f</span>  <span class="PreProc">0</span><span class="Constant">0</span>                                      <span class="Comment"># pop stack into *EAX</span>
+<span id="L517" class="LineNr">517 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (pop r/m32) 000 (dest EAX)</span>
+<span id="L518" class="LineNr">518 </span>== <span class="Constant">0x10</span>  <span class="Comment"># data segment</span>
+<span id="L519" class="LineNr">519 </span><span class="Constant">30</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0x30</span>
+<span id="L520" class="LineNr">520 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L412'>pop</a> into r/m32</span>
+<span id="L521" class="LineNr">521 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L522" class="LineNr">522 </span><span class="traceContains">+run: popping value 0x00000030</span>
+<span id="L523" class="LineNr">523 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000014</span>
+<span id="L524" class="LineNr">524 </span>
+<span id="L525" class="LineNr">525 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L526" class="LineNr">526 </span><span class="Normal">case</span> <span class="Constant">0x8f</span>: <span class="Delimiter">{</span>  <span class="Comment">// pop stack into r/m32</span>
+<span id="L527" class="LineNr">527 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L528" class="LineNr">528 </span>  <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L529" class="LineNr">529 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L530" class="LineNr">530 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>
+<span id="L531" class="LineNr">531 </span>      <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L532" class="LineNr">532 </span>      <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L533" class="LineNr">533 </span>      *dest = <a href='013direct_addressing.cc.html#L412'>pop</a><span class="Delimiter">();</span>
+<span id="L534" class="LineNr">534 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L535" class="LineNr">535 </span>    <span class="Delimiter">}</span>
+<span id="L536" class="LineNr">536 </span>  <span class="Delimiter">}</span>
+<span id="L537" class="LineNr">537 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L538" class="LineNr">538 </span><span class="Delimiter">}</span>
+<span id="L539" class="LineNr">539 </span>
+<span id="L540" class="LineNr">540 </span><span class="SalientComment">//:: special-case for loading address from disp32 rather than register</span>
+<span id="L541" class="LineNr">541 </span>
+<span id="L542" class="LineNr">542 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_displacement)</span>
+<span id="L543" class="LineNr">543 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
+<span id="L544" class="LineNr">544 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L545" class="LineNr">545 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L546" class="LineNr">546 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  1d            <span class="Constant">60</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>              <span class="Comment"># add EBX to *0x60</span>
+<span id="L547" class="LineNr">547 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 101 (dest in disp32)</span>
+<span id="L548" class="LineNr">548 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L549" class="LineNr">549 </span><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"># 1</span>
+<span id="L550" class="LineNr">550 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
+<span id="L551" class="LineNr">551 </span><span class="traceContains">+run: effective address is 0x60 (disp32)</span>
+<span id="L552" class="LineNr">552 </span><span class="traceContains">+run: storing 0x00000011</span>
+<span id="L553" class="LineNr">553 </span>
+<span id="L554" class="LineNr">554 </span><span class="Delimiter">:(before &quot;End Mod 0 Special-cases(addr)&quot;)</span>
+<span id="L555" class="LineNr">555 </span><span class="Normal">case</span> <span class="Constant">5</span>:  <span class="Comment">// exception: mod 0b00 rm 0b101 =&gt; incoming disp32</span>
+<span id="L556" class="LineNr">556 </span>  addr = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
+<span id="L557" class="LineNr">557 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L558" class="LineNr">558 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L559" class="LineNr">559 </span>
+<span id="L560" class="LineNr">560 </span><span class="Comment">//:</span>
 <span id="L561" class="LineNr">561 </span>
-<span id="L562" class="LineNr">562 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
-<span id="L563" class="LineNr">563 </span><span class="Normal">case</span> <span class="Constant">2</span>:  <span class="Comment">// indirect + disp32 addressing</span>
-<span id="L564" class="LineNr">564 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L565" class="LineNr">565 </span>  <span class="Normal">default</span>:
-<span id="L566" class="LineNr">566 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L567" class="LineNr">567 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L568" class="LineNr">568 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L569" class="LineNr">569 </span>  <span class="Comment">// End Mod 2 Special-cases(addr)</span>
-<span id="L570" class="LineNr">570 </span>  <span class="Delimiter">}</span>
-<span id="L571" class="LineNr">571 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>addr &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L572" class="LineNr">572 </span>    addr += <a href='011run.cc.html#L292'>imm32</a><span class="Delimiter">();</span>
-<span id="L573" class="LineNr">573 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp32)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L574" class="LineNr">574 </span>  <span class="Delimiter">}</span>
-<span id="L575" class="LineNr">575 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L576" class="LineNr">576 </span>
-<span id="L577" class="LineNr">577 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_negative_disp32)</span>
-<span id="L578" class="LineNr">578 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L579" class="LineNr">579 </span><span class="Special">% Reg[EAX].i = 0x61;  // dest</span>
-<span id="L580" class="LineNr">580 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L581" class="LineNr">581 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L582" class="LineNr">582 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">98</span>            ff ff ff ff              <span class="Comment"># add EBX to *(EAX-1)</span>
-<span id="L583" class="LineNr">583 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L584" class="LineNr">584 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L585" class="LineNr">585 </span><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"># 1</span>
-<span id="L586" class="LineNr">586 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L587" class="LineNr">587 </span><span class="traceContains">+run: effective address is initially 0x61 (EAX)</span>
-<span id="L588" class="LineNr">588 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp32)</span>
-<span id="L589" class="LineNr">589 </span><span class="traceContains">+run: storing 0x00000011</span>
+<span id="L562" class="LineNr">562 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_disp8)</span>
+<span id="L563" class="LineNr">563 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
+<span id="L564" class="LineNr">564 </span><span class="Special">% Reg[EAX].i = 0x5e;  // dest</span>
+<span id="L565" class="LineNr">565 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L566" class="LineNr">566 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L567" class="LineNr">567 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">58</span>            <span class="PreProc">0</span><span class="Constant">2</span>                       <span class="Comment"># add EBX to *(EAX+2)</span>
+<span id="L568" class="LineNr">568 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L569" class="LineNr">569 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L570" class="LineNr">570 </span><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"># 1</span>
+<span id="L571" class="LineNr">571 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
+<span id="L572" class="LineNr">572 </span><span class="traceContains">+run: effective address is initially 0x5e (EAX)</span>
+<span id="L573" class="LineNr">573 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp8)</span>
+<span id="L574" class="LineNr">574 </span><span class="traceContains">+run: storing 0x00000011</span>
+<span id="L575" class="LineNr">575 </span>
+<span id="L576" class="LineNr">576 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
+<span id="L577" class="LineNr">577 </span><span class="Normal">case</span> <span class="Constant">1</span>:  <span class="Comment">// indirect + disp8 addressing</span>
+<span id="L578" class="LineNr">578 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L579" class="LineNr">579 </span>  <span class="Normal">default</span>:
+<span id="L580" class="LineNr">580 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L581" class="LineNr">581 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L582" class="LineNr">582 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L583" class="LineNr">583 </span>  <span class="Comment">// End Mod 1 Special-cases(addr)</span>
+<span id="L584" class="LineNr">584 </span>  <span class="Delimiter">}</span>
+<span id="L585" class="LineNr">585 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>addr &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L586" class="LineNr">586 </span>    addr += <span class="Normal">static_cast</span>&lt;<span class="Normal">int8_t</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">());</span>
+<span id="L587" class="LineNr">587 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp8)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L588" class="LineNr">588 </span>  <span class="Delimiter">}</span>
+<span id="L589" class="LineNr">589 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L590" class="LineNr">590 </span>
+<span id="L591" class="LineNr">591 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_negative_disp8)</span>
+<span id="L592" class="LineNr">592 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
+<span id="L593" class="LineNr">593 </span><span class="Special">% Reg[EAX].i = 0x61;  // dest</span>
+<span id="L594" class="LineNr">594 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L595" class="LineNr">595 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L596" class="LineNr">596 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">58</span>            ff                       <span class="Comment"># add EBX to *(EAX-1)</span>
+<span id="L597" class="LineNr">597 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L598" class="LineNr">598 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L599" class="LineNr">599 </span><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"># 1</span>
+<span id="L600" class="LineNr">600 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
+<span id="L601" class="LineNr">601 </span><span class="traceContains">+run: effective address is initially 0x61 (EAX)</span>
+<span id="L602" class="LineNr">602 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp8)</span>
+<span id="L603" class="LineNr">603 </span><span class="traceContains">+run: storing 0x00000011</span>
+<span id="L604" class="LineNr">604 </span>
+<span id="L605" class="LineNr">605 </span><span class="Comment">//:</span>
+<span id="L606" class="LineNr">606 </span>
+<span id="L607" class="LineNr">607 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_disp32)</span>
+<span id="L608" class="LineNr">608 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
+<span id="L609" class="LineNr">609 </span><span class="Special">% Reg[EAX].i = 0x5e;  // dest</span>
+<span id="L610" class="LineNr">610 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L611" class="LineNr">611 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L612" class="LineNr">612 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">98</span>            <span class="PreProc">0</span><span class="Constant">2</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>              <span class="Comment"># add EBX to *(EAX+2)</span>
+<span id="L613" class="LineNr">613 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L614" class="LineNr">614 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L615" class="LineNr">615 </span><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"># 1</span>
+<span id="L616" class="LineNr">616 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
+<span id="L617" class="LineNr">617 </span><span class="traceContains">+run: effective address is initially 0x5e (EAX)</span>
+<span id="L618" class="LineNr">618 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp32)</span>
+<span id="L619" class="LineNr">619 </span><span class="traceContains">+run: storing 0x00000011</span>
+<span id="L620" class="LineNr">620 </span>
+<span id="L621" class="LineNr">621 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
+<span id="L622" class="LineNr">622 </span><span class="Normal">case</span> <span class="Constant">2</span>:  <span class="Comment">// indirect + disp32 addressing</span>
+<span id="L623" class="LineNr">623 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L624" class="LineNr">624 </span>  <span class="Normal">default</span>:
+<span id="L625" class="LineNr">625 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L626" class="LineNr">626 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L627" class="LineNr">627 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L628" class="LineNr">628 </span>  <span class="Comment">// End Mod 2 Special-cases(addr)</span>
+<span id="L629" class="LineNr">629 </span>  <span class="Delimiter">}</span>
+<span id="L630" class="LineNr">630 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>addr &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L631" class="LineNr">631 </span>    addr += <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
+<span id="L632" class="LineNr">632 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp32)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L633" class="LineNr">633 </span>  <span class="Delimiter">}</span>
+<span id="L634" class="LineNr">634 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L635" class="LineNr">635 </span>
+<span id="L636" class="LineNr">636 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_negative_disp32)</span>
+<span id="L637" class="LineNr">637 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
+<span id="L638" class="LineNr">638 </span><span class="Special">% Reg[EAX].i = 0x61;  // dest</span>
+<span id="L639" class="LineNr">639 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L640" class="LineNr">640 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L641" class="LineNr">641 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">98</span>            ff ff ff ff              <span class="Comment"># add EBX to *(EAX-1)</span>
+<span id="L642" class="LineNr">642 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L643" class="LineNr">643 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L644" class="LineNr">644 </span><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"># 1</span>
+<span id="L645" class="LineNr">645 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
+<span id="L646" class="LineNr">646 </span><span class="traceContains">+run: effective address is initially 0x61 (EAX)</span>
+<span id="L647" class="LineNr">647 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp32)</span>
+<span id="L648" class="LineNr">648 </span><span class="traceContains">+run: storing 0x00000011</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/015immediate_addressing.cc.html b/html/subx/015immediate_addressing.cc.html
index caac7579..88361ce4 100644
--- a/html/subx/015immediate_addressing.cc.html
+++ b/html/subx/015immediate_addressing.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/015immediate_addressing.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.PreProc { color: #800080; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.CommentedCode { color: #6c6c6c; }
 .SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .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; }
+.CommentedCode { color: #6c6c6c; }
 .traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
@@ -65,7 +65,7 @@ if ('onhashchange' in window) {
 <span id="L1" class="LineNr">  1 </span><span class="Comment">//: instructions that (immediately) contain an argument to act with</span>
 <span id="L2" class="LineNr">  2 </span>
 <span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;combine rm32 with <a href='011run.cc.html#L292'>imm32</a> based on subop&quot;</span><span class="Delimiter">);</span>
+<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;combine rm32 with <a href='011run.cc.html#L299'>imm32</a> based on subop&quot;</span><span class="Delimiter">);</span>
 <span id="L5" class="LineNr">  5 </span>
 <span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(scenario add_imm32_to_r32)</span>
 <span id="L7" class="LineNr">  7 </span><span class="Special">% Reg[EBX].i = 1;</span>
@@ -73,26 +73,26 @@ if ('onhashchange' in window) {
 <span id="L9" class="LineNr">  9 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L10" class="LineNr"> 10 </span>  <span class="Constant">81</span>  c3                          0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to EBX</span>
 <span id="L11" class="LineNr"> 11 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 000 (add imm32) 011 (dest EBX)</span>
-<span id="L12" class="LineNr"> 12 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a with r/m32</span>
+<span id="L12" class="LineNr"> 12 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
 <span id="L13" class="LineNr"> 13 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: <a href='036recommend_labels.cc.html#L54'>subop</a> add</span>
+<span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: subop add</span>
 <span id="L15" class="LineNr"> 15 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span>
 <span id="L16" class="LineNr"> 16 </span>
 <span id="L17" class="LineNr"> 17 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L18" class="LineNr"> 18 </span><span class="Normal">case</span> <span class="Constant">0x81</span>: <span class="Delimiter">{</span>  <span class="Comment">// combine imm32 with r/m32</span>
 <span id="L19" class="LineNr"> 19 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L20" class="LineNr"> 20 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L292'>imm32</a><span class="Delimiter">();</span>
-<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;combine <a href='011run.cc.html#L292'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L20" class="LineNr"> 20 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;combine <a href='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L22" class="LineNr"> 22 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L23" class="LineNr"> 23 </span>  <span class="Normal">uint8_t</span> <a href='036recommend_labels.cc.html#L54'>subop</a> = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span><a href='036recommend_labels.cc.html#L54'>subop</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L23" class="LineNr"> 23 </span>  <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Normal">case</span> <span class="Constant">0</span>:
 <span id="L26" class="LineNr"> 26 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop add&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L27" class="LineNr"> 27 </span>    <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L28" class="LineNr"> 28 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L29" class="LineNr"> 29 </span>  <span class="Comment">// End Op 81 Subops</span>
 <span id="L30" class="LineNr"> 30 </span>  <span class="Normal">default</span>:
-<span id="L31" class="LineNr"> 31 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after 81: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span><a href='036recommend_labels.cc.html#L54'>subop</a><span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L31" class="LineNr"> 31 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after 81: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L32" class="LineNr"> 32 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L33" class="LineNr"> 33 </span>  <span class="Delimiter">}</span>
 <span id="L34" class="LineNr"> 34 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -108,28 +108,28 @@ if ('onhashchange' in window) {
 <span id="L44" class="LineNr"> 44 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (add imm32) 011 (dest EBX)</span>
 <span id="L45" class="LineNr"> 45 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
 <span id="L46" class="LineNr"> 46 </span><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"># 1</span>
-<span id="L47" class="LineNr"> 47 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a with r/m32</span>
+<span id="L47" class="LineNr"> 47 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
 <span id="L48" class="LineNr"> 48 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L49" class="LineNr"> 49 </span><span class="traceContains">+run: <a href='036recommend_labels.cc.html#L54'>subop</a> add</span>
+<span id="L49" class="LineNr"> 49 </span><span class="traceContains">+run: subop add</span>
 <span id="L50" class="LineNr"> 50 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span>
 <span id="L51" class="LineNr"> 51 </span>
 <span id="L52" class="LineNr"> 52 </span><span class="SalientComment">//:: subtract</span>
 <span id="L53" class="LineNr"> 53 </span>
 <span id="L54" class="LineNr"> 54 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L55" class="LineNr"> 55 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract <a href='011run.cc.html#L292'>imm32</a> from R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract <a href='011run.cc.html#L299'>imm32</a> from R0 (EAX)&quot;</span><span class="Delimiter">);</span>
 <span id="L56" class="LineNr"> 56 </span>
 <span id="L57" class="LineNr"> 57 </span><span class="Delimiter">:(scenario subtract_imm32_from_eax)</span>
 <span id="L58" class="LineNr"> 58 </span><span class="Special">% Reg[EAX].i = 0x0d0c0baa;</span>
 <span id="L59" class="LineNr"> 59 </span>== <span class="Constant">0x1</span>
 <span id="L60" class="LineNr"> 60 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L61" class="LineNr"> 61 </span>  2d                              0a 0b 0c 0d  <span class="Comment"># subtract 0x0d0c0b0a from EAX</span>
-<span id="L62" class="LineNr"> 62 </span><span class="traceContains">+run: subtract <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a from <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L62" class="LineNr"> 62 </span><span class="traceContains">+run: subtract <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a from <a href='010---vm.cc.html#L13'>EAX</a></span>
 <span id="L63" class="LineNr"> 63 </span><span class="traceContains">+run: storing 0x000000a0</span>
 <span id="L64" class="LineNr"> 64 </span>
 <span id="L65" class="LineNr"> 65 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L66" class="LineNr"> 66 </span><span class="Normal">case</span> <span class="Constant">0x2d</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract imm32 from EAX</span>
-<span id="L67" class="LineNr"> 67 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L292'>imm32</a><span class="Delimiter">();</span>
-<span id="L68" class="LineNr"> 68 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract <a href='011run.cc.html#L292'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L67" class="LineNr"> 67 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
+<span id="L68" class="LineNr"> 68 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract <a href='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L69" class="LineNr"> 69 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L70" class="LineNr"> 70 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L71" class="LineNr"> 71 </span><span class="Delimiter">}</span>
@@ -144,9 +144,9 @@ if ('onhashchange' in window) {
 <span id="L80" class="LineNr"> 80 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 101 (subtract imm32) 011 (dest EBX)</span>
 <span id="L81" class="LineNr"> 81 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
 <span id="L82" class="LineNr"> 82 </span>0a <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 10</span>
-<span id="L83" class="LineNr"> 83 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L292'>imm32</a> 0x00000001 with r/m32</span>
+<span id="L83" class="LineNr"> 83 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x00000001 with r/m32</span>
 <span id="L84" class="LineNr"> 84 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L85" class="LineNr"> 85 </span><span class="traceContains">+run: <a href='036recommend_labels.cc.html#L54'>subop</a> subtract</span>
+<span id="L85" class="LineNr"> 85 </span><span class="traceContains">+run: subop subtract</span>
 <span id="L86" class="LineNr"> 86 </span><span class="traceContains">+run: storing 0x00000009</span>
 <span id="L87" class="LineNr"> 87 </span>
 <span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
@@ -164,28 +164,28 @@ if ('onhashchange' in window) {
 <span id="L100" class="LineNr">100 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Constant">81</span>  eb                          <span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># subtract 1 from EBX</span>
 <span id="L102" class="LineNr">102 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subtract imm32) 011 (dest EBX)</span>
-<span id="L103" class="LineNr">103 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L292'>imm32</a> 0x00000001 with r/m32</span>
+<span id="L103" class="LineNr">103 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x00000001 with r/m32</span>
 <span id="L104" class="LineNr">104 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L105" class="LineNr">105 </span><span class="traceContains">+run: <a href='036recommend_labels.cc.html#L54'>subop</a> subtract</span>
+<span id="L105" class="LineNr">105 </span><span class="traceContains">+run: subop subtract</span>
 <span id="L106" class="LineNr">106 </span><span class="traceContains">+run: storing 0x00000009</span>
 <span id="L107" class="LineNr">107 </span>
 <span id="L108" class="LineNr">108 </span><span class="SalientComment">//:: and</span>
 <span id="L109" class="LineNr">109 </span>
 <span id="L110" class="LineNr">110 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L111" class="LineNr">111 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise AND of <a href='011run.cc.html#L292'>imm32</a> with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L111" class="LineNr">111 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise AND of <a href='011run.cc.html#L299'>imm32</a> with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
 <span id="L112" class="LineNr">112 </span>
 <span id="L113" class="LineNr">113 </span><span class="Delimiter">:(scenario and_imm32_with_eax)</span>
 <span id="L114" class="LineNr">114 </span><span class="Special">% Reg[EAX].i = 0xff;</span>
 <span id="L115" class="LineNr">115 </span>== <span class="Constant">0x1</span>
 <span id="L116" class="LineNr">116 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L117" class="LineNr">117 </span>  <span class="Constant">25</span>                              0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EAX</span>
-<span id="L118" class="LineNr">118 </span><span class="traceContains">+run: and <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L118" class="LineNr">118 </span><span class="traceContains">+run: and <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
 <span id="L119" class="LineNr">119 </span><span class="traceContains">+run: storing 0x0000000a</span>
 <span id="L120" class="LineNr">120 </span>
 <span id="L121" class="LineNr">121 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L122" class="LineNr">122 </span><span class="Normal">case</span> <span class="Constant">0x25</span>: <span class="Delimiter">{</span>  <span class="Comment">// and imm32 with EAX</span>
-<span id="L123" class="LineNr">123 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L292'>imm32</a><span class="Delimiter">();</span>
-<span id="L124" class="LineNr">124 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and <a href='011run.cc.html#L292'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L123" class="LineNr">123 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
+<span id="L124" class="LineNr">124 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and <a href='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L125" class="LineNr">125 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L126" class="LineNr">126 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L127" class="LineNr">127 </span><span class="Delimiter">}</span>
@@ -200,9 +200,9 @@ if ('onhashchange' in window) {
 <span id="L136" class="LineNr">136 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 100 (and imm32) 011 (dest EBX)</span>
 <span id="L137" class="LineNr">137 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
 <span id="L138" class="LineNr">138 </span>ff <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0xff</span>
-<span id="L139" class="LineNr">139 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a with r/m32</span>
+<span id="L139" class="LineNr">139 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
 <span id="L140" class="LineNr">140 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L141" class="LineNr">141 </span><span class="traceContains">+run: <a href='036recommend_labels.cc.html#L54'>subop</a> and</span>
+<span id="L141" class="LineNr">141 </span><span class="traceContains">+run: subop and</span>
 <span id="L142" class="LineNr">142 </span><span class="traceContains">+run: storing 0x0000000a</span>
 <span id="L143" class="LineNr">143 </span>
 <span id="L144" class="LineNr">144 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
@@ -220,28 +220,28 @@ if ('onhashchange' in window) {
 <span id="L156" class="LineNr">156 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L157" class="LineNr">157 </span>  <span class="Constant">81</span>  e3                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EBX</span>
 <span id="L158" class="LineNr">158 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (and imm32) 011 (dest EBX)</span>
-<span id="L159" class="LineNr">159 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a with r/m32</span>
+<span id="L159" class="LineNr">159 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
 <span id="L160" class="LineNr">160 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L161" class="LineNr">161 </span><span class="traceContains">+run: <a href='036recommend_labels.cc.html#L54'>subop</a> and</span>
+<span id="L161" class="LineNr">161 </span><span class="traceContains">+run: subop and</span>
 <span id="L162" class="LineNr">162 </span><span class="traceContains">+run: storing 0x0000000a</span>
 <span id="L163" class="LineNr">163 </span>
 <span id="L164" class="LineNr">164 </span><span class="SalientComment">//:: or</span>
 <span id="L165" class="LineNr">165 </span>
 <span id="L166" class="LineNr">166 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L167" class="LineNr">167 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise OR of <a href='011run.cc.html#L292'>imm32</a> with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L167" class="LineNr">167 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise OR of <a href='011run.cc.html#L299'>imm32</a> with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
 <span id="L168" class="LineNr">168 </span>
 <span id="L169" class="LineNr">169 </span><span class="Delimiter">:(scenario or_imm32_with_eax)</span>
 <span id="L170" class="LineNr">170 </span><span class="Special">% Reg[EAX].i = 0xd0c0b0a0;</span>
 <span id="L171" class="LineNr">171 </span>== <span class="Constant">0x1</span>
 <span id="L172" class="LineNr">172 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L173" class="LineNr">173 </span>  0d                              0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EAX</span>
-<span id="L174" class="LineNr">174 </span><span class="traceContains">+run: or <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L174" class="LineNr">174 </span><span class="traceContains">+run: or <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
 <span id="L175" class="LineNr">175 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
 <span id="L176" class="LineNr">176 </span>
 <span id="L177" class="LineNr">177 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L178" class="LineNr">178 </span><span class="Normal">case</span> <span class="Constant">0x0d</span>: <span class="Delimiter">{</span>  <span class="Comment">// or imm32 with EAX</span>
-<span id="L179" class="LineNr">179 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L292'>imm32</a><span class="Delimiter">();</span>
-<span id="L180" class="LineNr">180 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or <a href='011run.cc.html#L292'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L179" class="LineNr">179 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
+<span id="L180" class="LineNr">180 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or <a href='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L181" class="LineNr">181 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L182" class="LineNr">182 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span>
@@ -256,9 +256,9 @@ if ('onhashchange' in window) {
 <span id="L192" class="LineNr">192 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 001 (or imm32) 011 (dest EBX)</span>
 <span id="L193" class="LineNr">193 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
 <span id="L194" class="LineNr">194 </span>a0 b0 c0 d0  <span class="Comment"># 0xd0c0b0a0</span>
-<span id="L195" class="LineNr">195 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a with r/m32</span>
+<span id="L195" class="LineNr">195 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
 <span id="L196" class="LineNr">196 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L197" class="LineNr">197 </span><span class="traceContains">+run: <a href='036recommend_labels.cc.html#L54'>subop</a> or</span>
+<span id="L197" class="LineNr">197 </span><span class="traceContains">+run: subop or</span>
 <span id="L198" class="LineNr">198 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
 <span id="L199" class="LineNr">199 </span>
 <span id="L200" class="LineNr">200 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
@@ -274,28 +274,28 @@ if ('onhashchange' in window) {
 <span id="L210" class="LineNr">210 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L211" class="LineNr">211 </span>  <span class="Constant">81</span>  cb                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EBX</span>
 <span id="L212" class="LineNr">212 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (or imm32) 011 (dest EBX)</span>
-<span id="L213" class="LineNr">213 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a with r/m32</span>
+<span id="L213" class="LineNr">213 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
 <span id="L214" class="LineNr">214 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L215" class="LineNr">215 </span><span class="traceContains">+run: <a href='036recommend_labels.cc.html#L54'>subop</a> or</span>
+<span id="L215" class="LineNr">215 </span><span class="traceContains">+run: subop or</span>
 <span id="L216" class="LineNr">216 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
 <span id="L217" class="LineNr">217 </span>
 <span id="L218" class="LineNr">218 </span><span class="SalientComment">//:: xor</span>
 <span id="L219" class="LineNr">219 </span>
 <span id="L220" class="LineNr">220 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L221" class="LineNr">221 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise XOR of <a href='011run.cc.html#L292'>imm32</a> with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L221" class="LineNr">221 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise XOR of <a href='011run.cc.html#L299'>imm32</a> with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
 <span id="L222" class="LineNr">222 </span>
 <span id="L223" class="LineNr">223 </span><span class="Delimiter">:(scenario xor_imm32_with_eax)</span>
 <span id="L224" class="LineNr">224 </span><span class="Special">% Reg[EAX].i = 0xddccb0a0;</span>
 <span id="L225" class="LineNr">225 </span>== <span class="Constant">0x1</span>
 <span id="L226" class="LineNr">226 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L227" class="LineNr">227 </span>  <span class="Constant">35</span>                              0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EAX</span>
-<span id="L228" class="LineNr">228 </span><span class="traceContains">+run: xor <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L228" class="LineNr">228 </span><span class="traceContains">+run: xor <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
 <span id="L229" class="LineNr">229 </span><span class="traceContains">+run: storing 0xd0c0bbaa</span>
 <span id="L230" class="LineNr">230 </span>
 <span id="L231" class="LineNr">231 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L232" class="LineNr">232 </span><span class="Normal">case</span> <span class="Constant">0x35</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor imm32 with EAX</span>
-<span id="L233" class="LineNr">233 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L292'>imm32</a><span class="Delimiter">();</span>
-<span id="L234" class="LineNr">234 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor <a href='011run.cc.html#L292'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L233" class="LineNr">233 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
+<span id="L234" class="LineNr">234 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor <a href='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L235" class="LineNr">235 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L236" class="LineNr">236 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L237" class="LineNr">237 </span><span class="Delimiter">}</span>
@@ -310,9 +310,9 @@ if ('onhashchange' in window) {
 <span id="L246" class="LineNr">246 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (xor imm32) 011 (dest EBX)</span>
 <span id="L247" class="LineNr">247 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
 <span id="L248" class="LineNr">248 </span>a0 b0 c0 d0  <span class="Comment"># 0xd0c0b0a0</span>
-<span id="L249" class="LineNr">249 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a with r/m32</span>
+<span id="L249" class="LineNr">249 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
 <span id="L250" class="LineNr">250 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L251" class="LineNr">251 </span><span class="traceContains">+run: <a href='036recommend_labels.cc.html#L54'>subop</a> xor</span>
+<span id="L251" class="LineNr">251 </span><span class="traceContains">+run: subop xor</span>
 <span id="L252" class="LineNr">252 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
 <span id="L253" class="LineNr">253 </span>
 <span id="L254" class="LineNr">254 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
@@ -328,29 +328,29 @@ if ('onhashchange' in window) {
 <span id="L264" class="LineNr">264 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L265" class="LineNr">265 </span>  <span class="Constant">81</span>  f3                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EBX</span>
 <span id="L266" class="LineNr">266 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 110 (xor imm32) 011 (dest EBX)</span>
-<span id="L267" class="LineNr">267 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a with r/m32</span>
+<span id="L267" class="LineNr">267 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
 <span id="L268" class="LineNr">268 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L269" class="LineNr">269 </span><span class="traceContains">+run: <a href='036recommend_labels.cc.html#L54'>subop</a> xor</span>
+<span id="L269" class="LineNr">269 </span><span class="traceContains">+run: subop xor</span>
 <span id="L270" class="LineNr">270 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
 <span id="L271" class="LineNr">271 </span>
 <span id="L272" class="LineNr">272 </span><span class="SalientComment">//:: compare (cmp)</span>
 <span id="L273" class="LineNr">273 </span>
 <span id="L274" class="LineNr">274 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L275" class="LineNr">275 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract <a href='011run.cc.html#L292'>imm32</a> from R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L275" class="LineNr">275 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract <a href='011run.cc.html#L299'>imm32</a> from R0 (EAX)&quot;</span><span class="Delimiter">);</span>
 <span id="L276" class="LineNr">276 </span>
 <span id="L277" class="LineNr">277 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_greater)</span>
 <span id="L278" class="LineNr">278 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b0a;</span>
 <span id="L279" class="LineNr">279 </span>== <span class="Constant">0x1</span>
 <span id="L280" class="LineNr">280 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L281" class="LineNr">281 </span>  3d                              <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with EAX</span>
-<span id="L282" class="LineNr">282 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b07</span>
+<span id="L282" class="LineNr">282 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b07</span>
 <span id="L283" class="LineNr">283 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
 <span id="L284" class="LineNr">284 </span>
 <span id="L285" class="LineNr">285 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L286" class="LineNr">286 </span><span class="Normal">case</span> <span class="Constant">0x3d</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract imm32 from EAX</span>
 <span id="L287" class="LineNr">287 </span>  <span class="Normal">int32_t</span> arg1 = Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L288" class="LineNr">288 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L292'>imm32</a><span class="Delimiter">();</span>
-<span id="L289" class="LineNr">289 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='011run.cc.html#L292'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L288" class="LineNr">288 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
+<span id="L289" class="LineNr">289 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L290" class="LineNr">290 </span>  <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span>
 <span id="L291" class="LineNr">291 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L292" class="LineNr">292 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
@@ -365,7 +365,7 @@ if ('onhashchange' in window) {
 <span id="L301" class="LineNr">301 </span>== <span class="Constant">0x1</span>
 <span id="L302" class="LineNr">302 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L303" class="LineNr">303 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX</span>
-<span id="L304" class="LineNr">304 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a</span>
+<span id="L304" class="LineNr">304 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a</span>
 <span id="L305" class="LineNr">305 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
 <span id="L306" class="LineNr">306 </span>
 <span id="L307" class="LineNr">307 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_equal)</span>
@@ -373,7 +373,7 @@ if ('onhashchange' in window) {
 <span id="L309" class="LineNr">309 </span>== <span class="Constant">0x1</span>
 <span id="L310" class="LineNr">310 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L311" class="LineNr">311 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX</span>
-<span id="L312" class="LineNr">312 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a</span>
+<span id="L312" class="LineNr">312 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a</span>
 <span id="L313" class="LineNr">313 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
 <span id="L314" class="LineNr">314 </span>
 <span id="L315" class="LineNr">315 </span><span class="Comment">//:</span>
@@ -384,7 +384,7 @@ if ('onhashchange' in window) {
 <span id="L320" class="LineNr">320 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L321" class="LineNr">321 </span>  <span class="Constant">81</span>  fb                          <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with EBX</span>
 <span id="L322" class="LineNr">322 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L323" class="LineNr">323 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b07 with r/m32</span>
+<span id="L323" class="LineNr">323 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b07 with r/m32</span>
 <span id="L324" class="LineNr">324 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
 <span id="L325" class="LineNr">325 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
 <span id="L326" class="LineNr">326 </span>
@@ -406,7 +406,7 @@ if ('onhashchange' in window) {
 <span id="L342" class="LineNr">342 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L343" class="LineNr">343 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX</span>
 <span id="L344" class="LineNr">344 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L345" class="LineNr">345 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a with r/m32</span>
+<span id="L345" class="LineNr">345 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
 <span id="L346" class="LineNr">346 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
 <span id="L347" class="LineNr">347 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
 <span id="L348" class="LineNr">348 </span>
@@ -416,7 +416,7 @@ if ('onhashchange' in window) {
 <span id="L352" class="LineNr">352 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L353" class="LineNr">353 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX</span>
 <span id="L354" class="LineNr">354 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L355" class="LineNr">355 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a with r/m32</span>
+<span id="L355" class="LineNr">355 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
 <span id="L356" class="LineNr">356 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
 <span id="L357" class="LineNr">357 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
 <span id="L358" class="LineNr">358 </span>
@@ -428,7 +428,7 @@ if ('onhashchange' in window) {
 <span id="L364" class="LineNr">364 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
 <span id="L365" class="LineNr">365 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
 <span id="L366" class="LineNr">366 </span>0a 0b 0c 0d  <span class="Comment"># 0x0d0c0b0a</span>
-<span id="L367" class="LineNr">367 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b07 with r/m32</span>
+<span id="L367" class="LineNr">367 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b07 with r/m32</span>
 <span id="L368" class="LineNr">368 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
 <span id="L369" class="LineNr">369 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
 <span id="L370" class="LineNr">370 </span>
@@ -440,7 +440,7 @@ if ('onhashchange' in window) {
 <span id="L376" class="LineNr">376 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
 <span id="L377" class="LineNr">377 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
 <span id="L378" class="LineNr">378 </span><span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># 0x0d0c0b07</span>
-<span id="L379" class="LineNr">379 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a with r/m32</span>
+<span id="L379" class="LineNr">379 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
 <span id="L380" class="LineNr">380 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
 <span id="L381" class="LineNr">381 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
 <span id="L382" class="LineNr">382 </span>
@@ -453,27 +453,27 @@ if ('onhashchange' in window) {
 <span id="L389" class="LineNr">389 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
 <span id="L390" class="LineNr">390 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
 <span id="L391" class="LineNr">391 </span>0a 0b 0c 0d  <span class="Comment"># 0x0d0c0b0a</span>
-<span id="L392" class="LineNr">392 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a with r/m32</span>
+<span id="L392" class="LineNr">392 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
 <span id="L393" class="LineNr">393 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
 <span id="L394" class="LineNr">394 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
 <span id="L395" class="LineNr">395 </span>
 <span id="L396" class="LineNr">396 </span><span class="SalientComment">//:: copy (mov)</span>
 <span id="L397" class="LineNr">397 </span>
 <span id="L398" class="LineNr">398 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L399" class="LineNr">399 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L292'>imm32</a> to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L400" class="LineNr">400 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L292'>imm32</a> to R1 (ECX)&quot;</span><span class="Delimiter">);</span>
-<span id="L401" class="LineNr">401 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L292'>imm32</a> to R2 (EDX)&quot;</span><span class="Delimiter">);</span>
-<span id="L402" class="LineNr">402 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L292'>imm32</a> to R3 (EBX)&quot;</span><span class="Delimiter">);</span>
-<span id="L403" class="LineNr">403 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L292'>imm32</a> to R4 (ESP)&quot;</span><span class="Delimiter">);</span>
-<span id="L404" class="LineNr">404 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L292'>imm32</a> to R5 (EBP)&quot;</span><span class="Delimiter">);</span>
-<span id="L405" class="LineNr">405 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L292'>imm32</a> to R6 (ESI)&quot;</span><span class="Delimiter">);</span>
-<span id="L406" class="LineNr">406 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L292'>imm32</a> to R7 (EDI)&quot;</span><span class="Delimiter">);</span>
+<span id="L399" class="LineNr">399 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L400" class="LineNr">400 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to R1 (ECX)&quot;</span><span class="Delimiter">);</span>
+<span id="L401" class="LineNr">401 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to R2 (EDX)&quot;</span><span class="Delimiter">);</span>
+<span id="L402" class="LineNr">402 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to R3 (EBX)&quot;</span><span class="Delimiter">);</span>
+<span id="L403" class="LineNr">403 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to R4 (ESP)&quot;</span><span class="Delimiter">);</span>
+<span id="L404" class="LineNr">404 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to R5 (EBP)&quot;</span><span class="Delimiter">);</span>
+<span id="L405" class="LineNr">405 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to R6 (ESI)&quot;</span><span class="Delimiter">);</span>
+<span id="L406" class="LineNr">406 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to R7 (EDI)&quot;</span><span class="Delimiter">);</span>
 <span id="L407" class="LineNr">407 </span>
 <span id="L408" class="LineNr">408 </span><span class="Delimiter">:(scenario copy_imm32_to_r32)</span>
 <span id="L409" class="LineNr">409 </span>== <span class="Constant">0x1</span>
 <span id="L410" class="LineNr">410 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L411" class="LineNr">411 </span>  bb                              0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to EBX</span>
-<span id="L412" class="LineNr">412 </span><span class="traceContains">+run: copy <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a to <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L412" class="LineNr">412 </span><span class="traceContains">+run: copy <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a to <a href='010---vm.cc.html#L16'>EBX</a></span>
 <span id="L413" class="LineNr">413 </span>
 <span id="L414" class="LineNr">414 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L415" class="LineNr">415 </span><span class="Normal">case</span> <span class="Constant">0xb8</span>:
@@ -485,8 +485,8 @@ if ('onhashchange' in window) {
 <span id="L421" class="LineNr">421 </span><span class="Normal">case</span> <span class="Constant">0xbe</span>:
 <span id="L422" class="LineNr">422 </span><span class="Normal">case</span> <span class="Constant">0xbf</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
 <span id="L423" class="LineNr">423 </span>  <span class="Normal">uint8_t</span> reg1 = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L424" class="LineNr">424 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L292'>imm32</a><span class="Delimiter">();</span>
-<span id="L425" class="LineNr">425 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='011run.cc.html#L292'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L424" class="LineNr">424 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
+<span id="L425" class="LineNr">425 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L426" class="LineNr">426 </span>  Reg[reg1]<span class="Delimiter">.</span>i = arg2<span class="Delimiter">;</span>
 <span id="L427" class="LineNr">427 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L428" class="LineNr">428 </span><span class="Delimiter">}</span>
@@ -494,7 +494,7 @@ if ('onhashchange' in window) {
 <span id="L430" class="LineNr">430 </span><span class="Comment">//:</span>
 <span id="L431" class="LineNr">431 </span>
 <span id="L432" class="LineNr">432 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L433" class="LineNr">433 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L292'>imm32</a> to rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L433" class="LineNr">433 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to rm32&quot;</span><span class="Delimiter">);</span>
 <span id="L434" class="LineNr">434 </span>
 <span id="L435" class="LineNr">435 </span><span class="Delimiter">:(scenario copy_imm32_to_mem_at_r32)</span>
 <span id="L436" class="LineNr">436 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
@@ -502,14 +502,14 @@ if ('onhashchange' in window) {
 <span id="L438" class="LineNr">438 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L439" class="LineNr">439 </span>  c7  <span class="PreProc">0</span><span class="Constant">3</span>                          0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to *EBX</span>
 <span id="L440" class="LineNr">440 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (unused) 011 (dest EBX)</span>
-<span id="L441" class="LineNr">441 </span><span class="traceContains">+run: copy <a href='011run.cc.html#L292'>imm32</a> 0x0d0c0b0a to r/m32</span>
+<span id="L441" class="LineNr">441 </span><span class="traceContains">+run: copy <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a to r/m32</span>
 <span id="L442" class="LineNr">442 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
 <span id="L443" class="LineNr">443 </span>
 <span id="L444" class="LineNr">444 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L445" class="LineNr">445 </span><span class="Normal">case</span> <span class="Constant">0xc7</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
 <span id="L446" class="LineNr">446 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L447" class="LineNr">447 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L292'>imm32</a><span class="Delimiter">();</span>
-<span id="L448" class="LineNr">448 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='011run.cc.html#L292'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L447" class="LineNr">447 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
+<span id="L448" class="LineNr">448 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L449" class="LineNr">449 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L450" class="LineNr">450 </span>  *arg1 = arg2<span class="Delimiter">;</span>
 <span id="L451" class="LineNr">451 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -518,23 +518,23 @@ if ('onhashchange' in window) {
 <span id="L454" class="LineNr">454 </span><span class="SalientComment">//:: push</span>
 <span id="L455" class="LineNr">455 </span>
 <span id="L456" class="LineNr">456 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L457" class="LineNr">457 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='011run.cc.html#L292'>imm32</a> to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L457" class="LineNr">457 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='011run.cc.html#L299'>imm32</a> to stack&quot;</span><span class="Delimiter">);</span>
 <span id="L458" class="LineNr">458 </span>
 <span id="L459" class="LineNr">459 </span><span class="Delimiter">:(scenario push_imm32)</span>
 <span id="L460" class="LineNr">460 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
 <span id="L461" class="LineNr">461 </span>== <span class="Constant">0x1</span>
 <span id="L462" class="LineNr">462 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L463" class="LineNr">463 </span>  <span class="Constant">68</span>                              af <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># push *EAX to stack</span>
-<span id="L464" class="LineNr">464 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L371'>push</a> <a href='011run.cc.html#L292'>imm32</a> 0x000000af</span>
+<span id="L464" class="LineNr">464 </span><span class="traceContains">+run: <a href='012elf.cc.html#L85'>push</a> <a href='011run.cc.html#L299'>imm32</a> 0x000000af</span>
 <span id="L465" class="LineNr">465 </span><span class="traceContains">+run: <a href='010---vm.cc.html#L17'>ESP</a> is now 0x00000010</span>
 <span id="L466" class="LineNr">466 </span><span class="traceContains">+run: <a href='003trace.cc.html#L74'>contents</a> at <a href='010---vm.cc.html#L17'>ESP</a>: 0x000000af</span>
 <span id="L467" class="LineNr">467 </span>
 <span id="L468" class="LineNr">468 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L469" class="LineNr">469 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span>
-<span id="L470" class="LineNr">470 </span>  <span class="Normal">uint32_t</span> val = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L292'>imm32</a><span class="Delimiter">());</span>
-<span id="L471" class="LineNr">471 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push <a href='011run.cc.html#L292'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L470" class="LineNr">470 </span>  <span class="Normal">uint32_t</span> val = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">());</span>
+<span id="L471" class="LineNr">471 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push <a href='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L472" class="LineNr">472 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: &quot; &lt;&lt; val &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
-<span id="L473" class="LineNr">473 </span>  <a href='013direct_addressing.cc.html#L371'>push</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
+<span id="L473" class="LineNr">473 </span>  <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
 <span id="L474" class="LineNr">474 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ESP is now 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L475" class="LineNr">475 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;contents at <a href='010---vm.cc.html#L17'>ESP</a>: 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L110'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L476" class="LineNr">476 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/subx/016index_addressing.cc.html b/html/subx/016index_addressing.cc.html
index 275dee17..e3ec8245 100644
--- a/html/subx/016index_addressing.cc.html
+++ b/html/subx/016index_addressing.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/016index_addressing.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .PreProc { color: #800080; }
-.traceContains { color: #008000; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
 -->
 </style>
 
@@ -92,7 +92,7 @@ if ('onhashchange' in window) {
 <span id="L30" class="LineNr"> 30 </span>  <span class="Delimiter">}</span>
 <span id="L31" class="LineNr"> 31 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L32" class="LineNr"> 32 </span>    <span class="Comment">// base == EBP &amp;&amp; mod == 0</span>
-<span id="L33" class="LineNr"> 33 </span>    addr = <a href='011run.cc.html#L292'>imm32</a><span class="Delimiter">();</span>  <span class="Comment">// ignore base</span>
+<span id="L33" class="LineNr"> 33 </span>    addr = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>  <span class="Comment">// ignore base</span>
 <span id="L34" class="LineNr"> 34 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Delimiter">}</span>
 <span id="L36" class="LineNr"> 36 </span>  <span class="Normal">uint8_t</span> index = <span class="Delimiter">(</span>sib&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
diff --git a/html/subx/017jump_disp8.cc.html b/html/subx/017jump_disp8.cc.html
index a824a5f3..881e2991 100644
--- a/html/subx/017jump_disp8.cc.html
+++ b/html/subx/017jump_disp8.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/017jump_disp8.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.traceAbsent { color: #c00000; }
+.traceContains { color: #008000; }
+.PreProc { color: #800080; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.traceContains { color: #008000; }
-.traceAbsent { color: #c00000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/subx/018jump_disp16.cc.html b/html/subx/018jump_disp16.cc.html
index 31ad160f..614f84f5 100644
--- a/html/subx/018jump_disp16.cc.html
+++ b/html/subx/018jump_disp16.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/018jump_disp16.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.traceAbsent { color: #c00000; }
+.traceContains { color: #008000; }
+.PreProc { color: #800080; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.traceContains { color: #008000; }
-.traceAbsent { color: #c00000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/subx/019functions.cc.html b/html/subx/019functions.cc.html
index 22830fed..bac71cb5 100644
--- a/html/subx/019functions.cc.html
+++ b/html/subx/019functions.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/019functions.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.SalientComment { color: #00ffff; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .CommentedCode { color: #6c6c6c; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.PreProc { color: #800080; }
 .traceContains { color: #008000; }
+.PreProc { color: #800080; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -72,17 +72,17 @@ if ('onhashchange' in window) {
 <span id="L9" class="LineNr"> 9 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L10" class="LineNr">10 </span>  e8                              a0 <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># call function offset at 0x000000a0</span>
 <span id="L11" class="LineNr">11 </span>  <span class="Comment"># next EIP is 6</span>
-<span id="L12" class="LineNr">12 </span><span class="traceContains">+run: call <a href='011run.cc.html#L292'>imm32</a> 0x000000a0</span>
+<span id="L12" class="LineNr">12 </span><span class="traceContains">+run: call <a href='011run.cc.html#L299'>imm32</a> 0x000000a0</span>
 <span id="L13" class="LineNr">13 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span>
 <span id="L14" class="LineNr">14 </span><span class="traceContains">+run: pushing value 0x00000006</span>
 <span id="L15" class="LineNr">15 </span><span class="traceContains">+run: jumping to 0x000000a6</span>
 <span id="L16" class="LineNr">16 </span>
 <span id="L17" class="LineNr">17 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L18" class="LineNr">18 </span><span class="Normal">case</span> <span class="Constant">0xe8</span>: <span class="Delimiter">{</span>  <span class="Comment">// call disp32 relative to next EIP</span>
-<span id="L19" class="LineNr">19 </span>  <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L292'>imm32</a><span class="Delimiter">();</span>
-<span id="L20" class="LineNr">20 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call <a href='011run.cc.html#L292'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; offset &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L19" class="LineNr">19 </span>  <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
+<span id="L20" class="LineNr">20 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call <a href='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; offset &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L21" class="LineNr">21 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: EIP: &quot; &lt;&lt; EIP &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
-<span id="L22" class="LineNr">22 </span>  <a href='013direct_addressing.cc.html#L371'>push</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
+<span id="L22" class="LineNr">22 </span>  <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
 <span id="L23" class="LineNr">23 </span>  <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L24" class="LineNr">24 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L25" class="LineNr">25 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -107,7 +107,7 @@ if ('onhashchange' in window) {
 <span id="L44" class="LineNr">44 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span>  <span class="Comment">// call function pointer at r/m32</span>
 <span id="L45" class="LineNr">45 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L46" class="LineNr">46 </span>  <span class="Normal">int32_t</span>* offset = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L47" class="LineNr">47 </span>  <a href='013direct_addressing.cc.html#L371'>push</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
+<span id="L47" class="LineNr">47 </span>  <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
 <span id="L48" class="LineNr">48 </span>  <a href='010---vm.cc.html#L29'>EIP</a> += *offset<span class="Delimiter">;</span>
 <span id="L49" class="LineNr">49 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L50" class="LineNr">50 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -147,7 +147,7 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr">84 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L85" class="LineNr">85 </span><span class="Normal">case</span> <span class="Constant">0xc3</span>: <span class="Delimiter">{</span>  <span class="Comment">// return from a call</span>
 <span id="L86" class="LineNr">86 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;return&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L87" class="LineNr">87 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = <a href='013direct_addressing.cc.html#L419'>pop</a><span class="Delimiter">();</span>
+<span id="L87" class="LineNr">87 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = <a href='013direct_addressing.cc.html#L412'>pop</a><span class="Delimiter">();</span>
 <span id="L88" class="LineNr">88 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L89" class="LineNr">89 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L90" class="LineNr">90 </span><span class="Delimiter">}</span>
diff --git a/html/subx/020syscalls.cc.html b/html/subx/020syscalls.cc.html
index c4d39b2e..9b18f151 100644
--- a/html/subx/020syscalls.cc.html
+++ b/html/subx/020syscalls.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/020syscalls.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.PreProc { color: #800080; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -64,9 +64,9 @@ if ('onhashchange' in window) {
 <span id="L4" class="LineNr">  4 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L5" class="LineNr">  5 </span><span class="Normal">case</span> <span class="Constant">0xcd</span>: <span class="Delimiter">{</span>  <span class="Comment">// int imm8 (software interrupt)</span>
 <span id="L6" class="LineNr">  6 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;syscall&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L7" class="LineNr">  7 </span>  <span class="Normal">uint8_t</span> code = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L8" class="LineNr">  8 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>code != <span class="Constant">0x80</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L9" class="LineNr">  9 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Unimplemented interrupt code &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L259'>HEXBYTE</a> &lt;&lt; code &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L7" class="LineNr">  7 </span>  <span class="Normal">uint8_t</span> <a href='031check_operands.cc.html#L14'>code</a> = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L8" class="LineNr">  8 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a> != <span class="Constant">0x80</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L9" class="LineNr">  9 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Unimplemented interrupt <a href='031check_operands.cc.html#L14'>code</a> &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L259'>HEXBYTE</a> &lt;&lt; <a href='031check_operands.cc.html#L14'>code</a> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L10" class="LineNr"> 10 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;  Only `int 80h` supported for now.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L11" class="LineNr"> 11 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L12" class="LineNr"> 12 </span>  <span class="Delimiter">}</span>
@@ -78,7 +78,7 @@ if ('onhashchange' in window) {
 <span id="L18" class="LineNr"> 18 </span><span class="Normal">void</span> <a href='020syscalls.cc.html#L18'>process_int80</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L19" class="LineNr"> 19 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Normal">case</span> <span class="Constant">1</span>:
-<span id="L21" class="LineNr"> 21 </span>    exit<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">exit code</span><span class="Comment">*/</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L21" class="LineNr"> 21 </span>    exit<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">exit <a href='031check_operands.cc.html#L14'>code</a></span><span class="Comment">*/</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L22" class="LineNr"> 22 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Normal">case</span> <span class="Constant">3</span>:
 <span id="L24" class="LineNr"> 24 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;read: &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; Reg[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">'/'</span> &lt;&lt; <a href='010---vm.cc.html#L123'>mem_addr_string</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">' '</span> &lt;&lt; Reg[EDX]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
@@ -127,7 +127,7 @@ if ('onhashchange' in window) {
 <span id="L67" class="LineNr"> 67 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L68" class="LineNr"> 68 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L69" class="LineNr"> 69 </span>  <span class="Normal">case</span> <span class="Constant">45</span>:  <span class="Comment">// brk: modify size of data segment</span>
-<span id="L70" class="LineNr"> 70 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;grow <a href='011run.cc.html#L118'>data</a> segment to &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L70" class="LineNr"> 70 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;grow <a href='011run.cc.html#L122'>data</a> segment to &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L71" class="LineNr"> 71 </span>    <a href='020syscalls.cc.html#L99'>resize_mem</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">new <a href='003trace.cc.html#L222'>end</a> address</span><span class="Comment">*/</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L72" class="LineNr"> 72 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L73" class="LineNr"> 73 </span>  <span class="Normal">default</span>:
@@ -140,30 +140,30 @@ if ('onhashchange' in window) {
 <span id="L80" class="LineNr"> 80 </span><span class="Normal">void</span> <a href='020syscalls.cc.html#L80'>check_flags</a><span class="Delimiter">(</span><span class="Normal">int</span> <a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L81" class="LineNr"> 81 </span>  <span class="Normal">uint32_t</span> flags = Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
 <span id="L82" class="LineNr"> 82 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>flags != <span class="Delimiter">((</span>flags &amp; O_RDONLY<span class="Delimiter">)</span> | <span class="Delimiter">(</span>flags &amp; O_WRONLY<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L83" class="LineNr"> 83 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: most POSIX flags to the open() syscall are not supported. Just O_RDONLY and O_WRONLY for now. Zero concurrent access support.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L83" class="LineNr"> 83 </span>    cerr &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: most POSIX flags to the open() syscall are not supported. Just O_RDONLY and O_WRONLY for now. Zero concurrent access support.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L84" class="LineNr"> 84 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L85" class="LineNr"> 85 </span>  <span class="Delimiter">}</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">((</span>flags &amp; O_RDONLY<span class="Delimiter">)</span> &amp;&amp; <span class="Delimiter">(</span>flags &amp; O_WRONLY<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: can't open a file for both reading and writing at once. See <a href="http://man7.org/linux/man-pages/man2/open.2.html">http://man7.org/linux/man-pages/man2/open.2.html</a>.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L87" class="LineNr"> 87 </span>    cerr &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: can't open a file for both reading and writing at once. See <a href="http://man7.org/linux/man-pages/man2/open.2.html.">http://man7.org/linux/man-pages/man2/open.2.html.</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L88" class="LineNr"> 88 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L89" class="LineNr"> 89 </span>  <span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">}</span>
 <span id="L91" class="LineNr"> 91 </span>
 <span id="L92" class="LineNr"> 92 </span><span class="Normal">void</span> <a href='020syscalls.cc.html#L92'>check_mode</a><span class="Delimiter">(</span><span class="Normal">int</span> <a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L93" class="LineNr"> 93 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u != <span class="PreProc">0</span><span class="Constant">600</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L94" class="LineNr"> 94 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: SubX is oblivious to file permissions; register &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L23'>reg</a> &lt;&lt; <span class="Constant">&quot; must be 0.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L94" class="LineNr"> 94 </span>    cerr &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: SubX is oblivious to file permissions; register &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L23'>reg</a> &lt;&lt; <span class="Constant">&quot; must be 0.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L95" class="LineNr"> 95 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Delimiter">}</span>
 <span id="L97" class="LineNr"> 97 </span><span class="Delimiter">}</span>
 <span id="L98" class="LineNr"> 98 </span>
 <span id="L99" class="LineNr"> 99 </span><span class="Normal">void</span> <a href='020syscalls.cc.html#L99'>resize_mem</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> new_end_address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>new_end_address &lt; <a href='010---vm.cc.html#L94'>Mem_offset</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L100" class="LineNr">100 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>new_end_address &lt; Mem_offset<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L101" class="LineNr">101 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: can't shrink data segment to before code segment</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L102" class="LineNr">102 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L103" class="LineNr">103 </span>  <span class="Delimiter">}</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Normal">int32_t</span> new_size = new_end_address - <a href='010---vm.cc.html#L94'>Mem_offset</a><span class="Delimiter">;</span>
+<span id="L104" class="LineNr">104 </span>  <span class="Normal">int32_t</span> new_size = new_end_address - Mem_offset<span class="Delimiter">;</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>new_size &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L106" class="LineNr">106 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: shrinking <a href='011run.cc.html#L118'>data</a> segment is not supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L106" class="LineNr">106 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: shrinking <a href='011run.cc.html#L122'>data</a> segment is not supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L107" class="LineNr">107 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L108" class="LineNr">108 </span>  <span class="Delimiter">}</span>
 <span id="L109" class="LineNr">109 </span>  <a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span>new_size<span class="Delimiter">);</span>  <span class="Comment">// will throw exception on failure</span>
diff --git a/html/subx/028translate.cc.html b/html/subx/028translate.cc.html
index 0838b51a..c9b3a369 100644
--- a/html/subx/028translate.cc.html
+++ b/html/subx/028translate.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/028translate.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.SalientComment { color: #00ffff; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -86,9 +86,9 @@ if ('onhashchange' in window) {
 <span id="L26" class="LineNr"> 26 </span>    cerr &lt;&lt; <span class="Constant">&quot;could not open &quot;</span> &lt;&lt; argv[<span class="Constant">2</span>] &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L27" class="LineNr"> 27 </span>    <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Delimiter">}</span>
-<span id="L29" class="LineNr"> 29 </span>  <a href='011run.cc.html#L125'>parse</a><span class="Delimiter">(</span>fin<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
+<span id="L29" class="LineNr"> 29 </span>  <a href='011run.cc.html#L129'>parse</a><span class="Delimiter">(</span>fin<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
 <span id="L30" class="LineNr"> 30 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L31" class="LineNr"> 31 </span>  <a href='011run.cc.html#L186'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L31" class="LineNr"> 31 </span>  <a href='011run.cc.html#L193'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
 <span id="L32" class="LineNr"> 32 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L33" class="LineNr"> 33 </span>  <a href='028translate.cc.html#L40'>save_elf</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> argv[<span class="Constant">3</span>]<span class="Delimiter">);</span>
 <span id="L34" class="LineNr"> 34 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> unlink<span class="Delimiter">(</span>argv[<span class="Constant">3</span>]<span class="Delimiter">);</span>
@@ -101,7 +101,7 @@ if ('onhashchange' in window) {
 <span id="L41" class="LineNr"> 41 </span>  ofstream out<span class="Delimiter">(</span>filename<span class="Delimiter">,</span> ios::binary<span class="Delimiter">);</span>
 <span id="L42" class="LineNr"> 42 </span>  <a href='028translate.cc.html#L48'>write_elf_header</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
 <span id="L43" class="LineNr"> 43 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>size<span class="Delimiter">();</span>  ++i<span class="Delimiter">)</span>
-<span id="L44" class="LineNr"> 44 </span>    <a href='028translate.cc.html#L141'>write_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> out<span class="Delimiter">);</span>
+<span id="L44" class="LineNr"> 44 </span>    <a href='028translate.cc.html#L142'>write_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> out<span class="Delimiter">);</span>
 <span id="L45" class="LineNr"> 45 </span>  out<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
 <span id="L46" class="LineNr"> 46 </span><span class="Delimiter">}</span>
 <span id="L47" class="LineNr"> 47 </span>
@@ -160,63 +160,64 @@ if ('onhashchange' in window) {
 <span id="L100" class="LineNr">100 </span>    <span class="Comment">// p_offset</span>
 <span id="L101" class="LineNr">101 </span>    emit<span class="Delimiter">(</span>p_offset<span class="Delimiter">);</span>
 <span id="L102" class="LineNr">102 </span>    <span class="Comment">// p_vaddr</span>
-<span id="L103" class="LineNr">103 </span>    emit<span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L105'>start</a><span class="Delimiter">);</span>
-<span id="L104" class="LineNr">104 </span>    <span class="Comment">// p_paddr</span>
-<span id="L105" class="LineNr">105 </span>    emit<span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L105'>start</a><span class="Delimiter">);</span>
-<span id="L106" class="LineNr">106 </span>    <span class="Comment">// p_filesz</span>
-<span id="L107" class="LineNr">107 </span>    <span class="Normal">uint32_t</span> size = <a href='028translate.cc.html#L151'>size_of</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L108" class="LineNr">108 </span>    assert<span class="Delimiter">(</span>size &lt; <a href='012elf.cc.html#L105'>SEGMENT_SIZE</a><span class="Delimiter">);</span>
-<span id="L109" class="LineNr">109 </span>    emit<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
-<span id="L110" class="LineNr">110 </span>    <span class="Comment">// p_memsz</span>
-<span id="L111" class="LineNr">111 </span>    emit<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
-<span id="L112" class="LineNr">112 </span>    <span class="Comment">// p_flags</span>
-<span id="L113" class="LineNr">113 </span>    <span class="Normal">uint32_t</span> p_flags = <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> ? <span class="Comment">/*</span><span class="Comment">r-x</span><span class="Comment">*/</span><span class="Constant">0x5</span> : <span class="Comment">/*</span><span class="Comment">rw-</span><span class="Comment">*/</span><span class="Constant">0x6</span><span class="Delimiter">;</span>  <span class="Comment">// convention: only first segment is code</span>
-<span id="L114" class="LineNr">114 </span>    emit<span class="Delimiter">(</span>p_flags<span class="Delimiter">);</span>
-<span id="L115" class="LineNr">115 </span>
-<span id="L116" class="LineNr">116 </span>    <span class="Comment">// p_align</span>
-<span id="L117" class="LineNr">117 </span>    <span class="Comment">// &quot;As the system creates or augments a process image, it logically copies</span>
-<span id="L118" class="LineNr">118 </span>    <span class="Comment">// a file's segment to a virtual memory segment.  When—and if— the system</span>
-<span id="L119" class="LineNr">119 </span>    <span class="Comment">// physically reads the file depends on the program's execution behavior,</span>
-<span id="L120" class="LineNr">120 </span>    <span class="Comment">// system load, and so on.  A process does not require a physical page</span>
-<span id="L121" class="LineNr">121 </span>    <span class="Comment">// unless it references the logical page during execution, and processes</span>
-<span id="L122" class="LineNr">122 </span>    <span class="Comment">// commonly leave many pages unreferenced. Therefore delaying physical</span>
-<span id="L123" class="LineNr">123 </span>    <span class="Comment">// reads frequently obviates them, improving system performance. To obtain</span>
-<span id="L124" class="LineNr">124 </span>    <span class="Comment">// this efficiency in practice, executable and shared object files must</span>
-<span id="L125" class="LineNr">125 </span>    <span class="Comment">// have segment images whose file offsets and virtual addresses are</span>
-<span id="L126" class="LineNr">126 </span>    <span class="Comment">// congruent, modulo the page size.&quot; -- <a href="http://refspecs.linuxbase.org/elf/elf.pdf">http://refspecs.linuxbase.org/elf/elf.pdf</a> (page 95)</span>
-<span id="L127" class="LineNr">127 </span>    <span class="Normal">uint32_t</span> p_align = <span class="Constant">0x1000</span><span class="Delimiter">;</span>  <span class="Comment">// default page size on linux</span>
-<span id="L128" class="LineNr">128 </span>    emit<span class="Delimiter">(</span>p_align<span class="Delimiter">);</span>
-<span id="L129" class="LineNr">129 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p_offset % p_align != p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L105'>start</a> % p_align<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L130" class="LineNr">130 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;segment starting at 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L105'>start</a> &lt;&lt; <span class="Constant">&quot; is improperly aligned; alignment for p_offset &quot;</span> &lt;&lt; p_offset &lt;&lt; <span class="Constant">&quot; should be &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_offset % p_align<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but is &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L105'>start</a> % p_align<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L131" class="LineNr">131 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L132" class="LineNr">132 </span>    <span class="Delimiter">}</span>
-<span id="L133" class="LineNr">133 </span>
-<span id="L134" class="LineNr">134 </span>    <span class="Comment">// prepare for next segment</span>
-<span id="L135" class="LineNr">135 </span>    p_offset += size<span class="Delimiter">;</span>
-<span id="L136" class="LineNr">136 </span>  <span class="Delimiter">}</span>
-<span id="L137" class="LineNr">137 </span><span class="Comment">#undef O</span>
-<span id="L138" class="LineNr">138 </span><span class="Comment">#undef emit</span>
-<span id="L139" class="LineNr">139 </span><span class="Delimiter">}</span>
-<span id="L140" class="LineNr">140 </span>
-<span id="L141" class="LineNr">141 </span><span class="Normal">void</span> <a href='028translate.cc.html#L141'>write_segment</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L143" class="LineNr">143 </span>    <span class="Normal">const</span> vector&lt;word&gt;&amp; w = s<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">;</span>
-<span id="L144" class="LineNr">144 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L145" class="LineNr">145 </span>      <span class="Normal">uint8_t</span> x = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">);</span>  <span class="Comment">// we're done with metadata by this point</span>
-<span id="L146" class="LineNr">146 </span>      out<span class="Delimiter">.</span>write<span class="Delimiter">(</span><span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">const</span> <span class="Normal">char</span>*&gt;<span class="Delimiter">(</span>&amp;x<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">sizeof(byte)</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L147" class="LineNr">147 </span>    <span class="Delimiter">}</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Delimiter">}</span>
-<span id="L149" class="LineNr">149 </span><span class="Delimiter">}</span>
-<span id="L150" class="LineNr">150 </span>
-<span id="L151" class="LineNr">151 </span><span class="Normal">uint32_t</span> <a href='028translate.cc.html#L151'>size_of</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L152" class="LineNr">152 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L153" class="LineNr">153 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L154" class="LineNr">154 </span>    sum += <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>
-<span id="L155" class="LineNr">155 </span>  <span class="Identifier">return</span> sum<span class="Delimiter">;</span>
-<span id="L156" class="LineNr">156 </span><span class="Delimiter">}</span>
-<span id="L157" class="LineNr">157 </span>
-<span id="L158" class="LineNr">158 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L159" class="LineNr">159 </span><span class="Normal">using</span> std::ios<span class="Delimiter">;</span>
+<span id="L103" class="LineNr">103 </span>    <span class="Normal">uint32_t</span> p_start = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L105'>start</a><span class="Delimiter">;</span>
+<span id="L104" class="LineNr">104 </span>    emit<span class="Delimiter">(</span>p_start<span class="Delimiter">);</span>
+<span id="L105" class="LineNr">105 </span>    <span class="Comment">// p_paddr</span>
+<span id="L106" class="LineNr">106 </span>    emit<span class="Delimiter">(</span>p_start<span class="Delimiter">);</span>
+<span id="L107" class="LineNr">107 </span>    <span class="Comment">// p_filesz</span>
+<span id="L108" class="LineNr">108 </span>    <span class="Normal">uint32_t</span> size = <a href='028translate.cc.html#L152'>num_words</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L109" class="LineNr">109 </span>    assert<span class="Delimiter">(</span>p_offset + size &lt; <a href='012elf.cc.html#L127'>SEGMENT_SIZE</a><span class="Delimiter">);</span>
+<span id="L110" class="LineNr">110 </span>    emit<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
+<span id="L111" class="LineNr">111 </span>    <span class="Comment">// p_memsz</span>
+<span id="L112" class="LineNr">112 </span>    emit<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
+<span id="L113" class="LineNr">113 </span>    <span class="Comment">// p_flags</span>
+<span id="L114" class="LineNr">114 </span>    <span class="Normal">uint32_t</span> p_flags = <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> ? <span class="Comment">/*</span><span class="Comment">r-x</span><span class="Comment">*/</span><span class="Constant">0x5</span> : <span class="Comment">/*</span><span class="Comment">rw-</span><span class="Comment">*/</span><span class="Constant">0x6</span><span class="Delimiter">;</span>  <span class="Comment">// convention: only first segment is code</span>
+<span id="L115" class="LineNr">115 </span>    emit<span class="Delimiter">(</span>p_flags<span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span>
+<span id="L117" class="LineNr">117 </span>    <span class="Comment">// p_align</span>
+<span id="L118" class="LineNr">118 </span>    <span class="Comment">// &quot;As the system creates or augments a process image, it logically copies</span>
+<span id="L119" class="LineNr">119 </span>    <span class="Comment">// a file's segment to a virtual memory segment.  When—and if— the system</span>
+<span id="L120" class="LineNr">120 </span>    <span class="Comment">// physically reads the file depends on the program's execution behavior,</span>
+<span id="L121" class="LineNr">121 </span>    <span class="Comment">// system load, and so on.  A process does not require a physical page</span>
+<span id="L122" class="LineNr">122 </span>    <span class="Comment">// unless it references the logical page during execution, and processes</span>
+<span id="L123" class="LineNr">123 </span>    <span class="Comment">// commonly leave many pages unreferenced. Therefore delaying physical</span>
+<span id="L124" class="LineNr">124 </span>    <span class="Comment">// reads frequently obviates them, improving system performance. To obtain</span>
+<span id="L125" class="LineNr">125 </span>    <span class="Comment">// this efficiency in practice, executable and shared object files must</span>
+<span id="L126" class="LineNr">126 </span>    <span class="Comment">// have segment images whose file offsets and virtual addresses are</span>
+<span id="L127" class="LineNr">127 </span>    <span class="Comment">// congruent, modulo the page size.&quot; -- <a href="http://refspecs.linuxbase.org/elf/elf.pdf">http://refspecs.linuxbase.org/elf/elf.pdf</a> (page 95)</span>
+<span id="L128" class="LineNr">128 </span>    <span class="Normal">uint32_t</span> p_align = <span class="Constant">0x1000</span><span class="Delimiter">;</span>  <span class="Comment">// default page size on linux</span>
+<span id="L129" class="LineNr">129 </span>    emit<span class="Delimiter">(</span>p_align<span class="Delimiter">);</span>
+<span id="L130" class="LineNr">130 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p_offset % p_align != p_start % p_align<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L131" class="LineNr">131 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;segment starting at 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; p_start &lt;&lt; <span class="Constant">&quot; is improperly aligned; alignment for p_offset &quot;</span> &lt;&lt; p_offset &lt;&lt; <span class="Constant">&quot; should be &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_offset % p_align<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but is &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_start % p_align<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L132" class="LineNr">132 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L133" class="LineNr">133 </span>    <span class="Delimiter">}</span>
+<span id="L134" class="LineNr">134 </span>
+<span id="L135" class="LineNr">135 </span>    <span class="Comment">// prepare for next segment</span>
+<span id="L136" class="LineNr">136 </span>    p_offset += size<span class="Delimiter">;</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Delimiter">}</span>
+<span id="L138" class="LineNr">138 </span><span class="Comment">#undef O</span>
+<span id="L139" class="LineNr">139 </span><span class="Comment">#undef emit</span>
+<span id="L140" class="LineNr">140 </span><span class="Delimiter">}</span>
+<span id="L141" class="LineNr">141 </span>
+<span id="L142" class="LineNr">142 </span><span class="Normal">void</span> <a href='028translate.cc.html#L142'>write_segment</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">,</span> ostream&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L143" class="LineNr">143 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L144" class="LineNr">144 </span>    <span class="Normal">const</span> vector&lt;word&gt;&amp; w = s<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">;</span>
+<span id="L145" class="LineNr">145 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L146" class="LineNr">146 </span>      <span class="Normal">uint8_t</span> x = <a href='011run.cc.html#L229'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>  <span class="Comment">// we're done with metadata by this point</span>
+<span id="L147" class="LineNr">147 </span>      out<span class="Delimiter">.</span>write<span class="Delimiter">(</span><span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">const</span> <span class="Normal">char</span>*&gt;<span class="Delimiter">(</span>&amp;x<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">sizeof(byte)</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L148" class="LineNr">148 </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">uint32_t</span> <a href='028translate.cc.html#L152'>num_words</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L153" class="LineNr">153 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L155" class="LineNr">155 </span>    sum += <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Identifier">return</span> sum<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">:(before &quot;End Includes&quot;)</span>
+<span id="L160" class="LineNr">160 </span><span class="Normal">using</span> std::ios<span class="Delimiter">;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/029transforms.cc.html b/html/subx/029transforms.cc.html
index 6f067d6f..174ba00a 100644
--- a/html/subx/029transforms.cc.html
+++ b/html/subx/029transforms.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/029transforms.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,10 +15,10 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/subx/030---operands.cc.html b/html/subx/030---operands.cc.html
index ea38d64b..207b0e05 100644
--- a/html/subx/030---operands.cc.html
+++ b/html/subx/030---operands.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/030---operands.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.traceContains { color: #008000; }
+.Identifier { color: #c0a020; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
 .SalientComment { color: #00ffff; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -80,7 +80,7 @@ if ('onhashchange' in window) {
 <span id="L19" class="LineNr"> 19 </span>  <span class="Constant">&quot;Each operand has a type. An instruction won't have more than one operand of</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Constant">&quot;any type.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Constant">&quot;Each instruction has some set of allowed operand types. It'll reject others.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;The complete list of operand <a href='031check_operands.cc.html#L397'>types</a>: mod, <a href='036recommend_labels.cc.html#L54'>subop</a>, r32 (register), rm32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;The complete list of operand <a href='031check_operands.cc.html#L399'>types</a>: mod, subop, r32 (register), rm32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Constant">&quot;(register or memory), scale, index, base, disp8, disp16, disp32, imm8,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Constant">&quot;imm32.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Constant">&quot;Each of these has its own help page. Try reading 'subx help mod' next.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
@@ -96,7 +96,7 @@ if ('onhashchange' in window) {
 <span id="L35" class="LineNr"> 35 </span>  bb                                                                                                                              <span class="Constant">0x2a</span>/imm32        <span class="Comment"># copy 42 to EBX</span>
 <span id="L36" class="LineNr"> 36 </span><span class="traceContains">+transform: packing instruction 'bb 0x2a/imm32'</span>
 <span id="L37" class="LineNr"> 37 </span><span class="traceContains">+transform: instruction after packing: 'bb 2a 00 00 00'</span>
-<span id="L38" class="LineNr"> 38 </span><span class="traceContains">+run: copy <a href='011run.cc.html#L292'>imm32</a> 0x0000002a to <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L38" class="LineNr"> 38 </span><span class="traceContains">+run: copy <a href='011run.cc.html#L299'>imm32</a> 0x0000002a to <a href='010---vm.cc.html#L16'>EBX</a></span>
 <span id="L39" class="LineNr"> 39 </span>
 <span id="L40" class="LineNr"> 40 </span><span class="Comment">//: complete set of valid operand types</span>
 <span id="L41" class="LineNr"> 41 </span>
@@ -194,19 +194,19 @@ if ('onhashchange' in window) {
 <span id="L133" class="LineNr">133 </span>
 <span id="L134" class="LineNr">134 </span><span class="SalientComment">//:: transform packing operands into bytes in the right order</span>
 <span id="L135" class="LineNr">135 </span>
-<span id="L136" class="LineNr">136 </span><span class="Delimiter">:(before &quot;End Transforms&quot;)</span>
+<span id="L136" class="LineNr">136 </span><span class="Delimiter">:(after &quot;Begin Transforms&quot;)</span>
 <span id="L137" class="LineNr">137 </span><span class="Comment">// Begin Level-2 Transforms</span>
-<span id="L138" class="LineNr">138 </span><a href='011run.cc.html#L184'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pack_operands<span class="Delimiter">);</span>
+<span id="L138" class="LineNr">138 </span><a href='011run.cc.html#L191'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pack_operands<span class="Delimiter">);</span>
 <span id="L139" class="LineNr">139 </span><span class="Comment">// End Level-2 Transforms</span>
 <span id="L140" class="LineNr">140 </span>
 <span id="L141" class="LineNr">141 </span><span class="Delimiter">:(code)</span>
 <span id="L142" class="LineNr">142 </span><span class="Normal">void</span> pack_operands<span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L143" class="LineNr">143 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L144" class="LineNr">144 </span>  segment&amp; code = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L144" class="LineNr">144 </span>  segment&amp; <a href='031check_operands.cc.html#L14'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L145" class="LineNr">145 </span>  <span class="Comment">// Pack Operands(segment code)</span>
 <span id="L146" class="LineNr">146 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- pack operands&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L147" class="LineNr">147 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L148" class="LineNr">148 </span>    line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L147" class="LineNr">147 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L148" class="LineNr">148 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L149" class="LineNr">149 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L150" class="LineNr">150 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;packing instruction '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">with metadata</span><span class="Comment">*/</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L151" class="LineNr">151 </span>    pack_operands<span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
@@ -215,76 +215,76 @@ if ('onhashchange' in window) {
 <span id="L154" class="LineNr">154 </span><span class="Delimiter">}</span>
 <span id="L155" class="LineNr">155 </span>
 <span id="L156" class="LineNr">156 </span><span class="Normal">void</span> pack_operands<span class="Delimiter">(</span>line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L157" class="LineNr">157 </span>  <a href='011run.cc.html#L110'>line</a> new_inst<span class="Delimiter">;</span>
+<span id="L157" class="LineNr">157 </span>  <a href='011run.cc.html#L114'>line</a> new_inst<span class="Delimiter">;</span>
 <span id="L158" class="LineNr">158 </span>  <a href='030---operands.cc.html#L166'>add_opcodes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
 <span id="L159" class="LineNr">159 </span>  <a href='030---operands.cc.html#L176'>add_modrm_byte</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
 <span id="L160" class="LineNr">160 </span>  <a href='030---operands.cc.html#L202'>add_sib_byte</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
 <span id="L161" class="LineNr">161 </span>  <a href='030---operands.cc.html#L224'>add_disp_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
 <span id="L162" class="LineNr">162 </span>  <a href='030---operands.cc.html#L236'>add_imm_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
-<span id="L163" class="LineNr">163 </span>  inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>
+<span id="L163" class="LineNr">163 </span>  inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>
 <span id="L164" class="LineNr">164 </span><span class="Delimiter">}</span>
 <span id="L165" class="LineNr">165 </span>
 <span id="L166" class="LineNr">166 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L166'>add_opcodes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L167" class="LineNr">167 </span>  out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
-<span id="L168" class="LineNr">168 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;0f&quot;</span> || in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;f2&quot;</span> || in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span>
-<span id="L169" class="LineNr">169 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
-<span id="L170" class="LineNr">170 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;f3&quot;</span> &amp;&amp; in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
-<span id="L171" class="LineNr">171 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
-<span id="L172" class="LineNr">172 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;f2&quot;</span> &amp;&amp; in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
-<span id="L173" class="LineNr">173 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
+<span id="L167" class="LineNr">167 </span>  out<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
+<span id="L168" class="LineNr">168 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;0f&quot;</span> || in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;f2&quot;</span> || in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span>
+<span id="L169" class="LineNr">169 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
+<span id="L170" class="LineNr">170 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;f3&quot;</span> &amp;&amp; in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
+<span id="L171" class="LineNr">171 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
+<span id="L172" class="LineNr">172 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;f2&quot;</span> &amp;&amp; in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
+<span id="L173" class="LineNr">173 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
 <span id="L174" class="LineNr">174 </span><span class="Delimiter">}</span>
 <span id="L175" class="LineNr">175 </span>
 <span id="L176" class="LineNr">176 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L176'>add_modrm_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L177" class="LineNr">177 </span>  <span class="Normal">uint8_t</span> mod=<span class="Constant">0</span><span class="Delimiter">,</span> reg_subop=<span class="Constant">0</span><span class="Delimiter">,</span> rm32=<span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L178" class="LineNr">178 </span>  <span class="Normal">bool</span> emit =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L179" class="LineNr">179 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L180" class="LineNr">180 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L179" class="LineNr">179 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L180" class="LineNr">180 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L181" class="LineNr">181 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L182" class="LineNr">182 </span>      mod = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">);</span>
+<span id="L182" class="LineNr">182 </span>      mod = <a href='011run.cc.html#L229'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
 <span id="L183" class="LineNr">183 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L184" class="LineNr">184 </span>    <span class="Delimiter">}</span>
 <span id="L185" class="LineNr">185 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L186" class="LineNr">186 </span>      rm32 = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">);</span>
+<span id="L186" class="LineNr">186 </span>      rm32 = <a href='011run.cc.html#L229'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
 <span id="L187" class="LineNr">187 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L188" class="LineNr">188 </span>    <span class="Delimiter">}</span>
 <span id="L189" class="LineNr">189 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L190" class="LineNr">190 </span>      reg_subop = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">);</span>
+<span id="L190" class="LineNr">190 </span>      reg_subop = <a href='011run.cc.html#L229'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
 <span id="L191" class="LineNr">191 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L192" class="LineNr">192 </span>    <span class="Delimiter">}</span>
 <span id="L193" class="LineNr">193 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L194" class="LineNr">194 </span>      reg_subop = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">);</span>
+<span id="L194" class="LineNr">194 </span>      reg_subop = <a href='011run.cc.html#L229'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
 <span id="L195" class="LineNr">195 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L196" class="LineNr">196 </span>    <span class="Delimiter">}</span>
 <span id="L197" class="LineNr">197 </span>  <span class="Delimiter">}</span>
 <span id="L198" class="LineNr">198 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>emit<span class="Delimiter">)</span>
-<span id="L199" class="LineNr">199 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L265'>hex_byte_text</a><span class="Delimiter">((</span>mod &lt;&lt; <span class="Constant">6</span><span class="Delimiter">)</span> | <span class="Delimiter">(</span>reg_subop &lt;&lt; <span class="Constant">3</span><span class="Delimiter">)</span> | rm32<span class="Delimiter">));</span>
+<span id="L199" class="LineNr">199 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L265'>hex_byte_text</a><span class="Delimiter">((</span>mod &lt;&lt; <span class="Constant">6</span><span class="Delimiter">)</span> | <span class="Delimiter">(</span>reg_subop &lt;&lt; <span class="Constant">3</span><span class="Delimiter">)</span> | rm32<span class="Delimiter">));</span>
 <span id="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">void</span> <a href='030---operands.cc.html#L202'>add_sib_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L203" class="LineNr">203 </span>  <span class="Normal">uint8_t</span> scale=<span class="Constant">0</span><span class="Delimiter">,</span> index=<span class="Constant">0</span><span class="Delimiter">,</span> base=<span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L204" class="LineNr">204 </span>  <span class="Normal">bool</span> emit =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L205" class="LineNr">205 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L206" class="LineNr">206 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L206" class="LineNr">206 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L207" class="LineNr">207 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;scale&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L208" class="LineNr">208 </span>      scale = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">);</span>
+<span id="L208" class="LineNr">208 </span>      scale = <a href='011run.cc.html#L229'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
 <span id="L209" class="LineNr">209 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L210" class="LineNr">210 </span>    <span class="Delimiter">}</span>
 <span id="L211" class="LineNr">211 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L212" class="LineNr">212 </span>      index = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">);</span>
+<span id="L212" class="LineNr">212 </span>      index = <a href='011run.cc.html#L229'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
 <span id="L213" class="LineNr">213 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L214" class="LineNr">214 </span>    <span class="Delimiter">}</span>
 <span id="L215" class="LineNr">215 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L216" class="LineNr">216 </span>      base = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">);</span>
+<span id="L216" class="LineNr">216 </span>      base = <a href='011run.cc.html#L229'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
 <span id="L217" class="LineNr">217 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L218" class="LineNr">218 </span>    <span class="Delimiter">}</span>
 <span id="L219" class="LineNr">219 </span>  <span class="Delimiter">}</span>
 <span id="L220" class="LineNr">220 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>emit<span class="Delimiter">)</span>
-<span id="L221" class="LineNr">221 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L265'>hex_byte_text</a><span class="Delimiter">((</span>scale &lt;&lt; <span class="Constant">6</span><span class="Delimiter">)</span> | <span class="Delimiter">(</span>index &lt;&lt; <span class="Constant">3</span><span class="Delimiter">)</span> | base<span class="Delimiter">));</span>
+<span id="L221" class="LineNr">221 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L265'>hex_byte_text</a><span class="Delimiter">((</span>scale &lt;&lt; <span class="Constant">6</span><span class="Delimiter">)</span> | <span class="Delimiter">(</span>index &lt;&lt; <span class="Constant">3</span><span class="Delimiter">)</span> | base<span class="Delimiter">));</span>
 <span id="L222" class="LineNr">222 </span><span class="Delimiter">}</span>
 <span id="L223" class="LineNr">223 </span>
 <span id="L224" class="LineNr">224 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L224'>add_disp_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L225" class="LineNr">225 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L226" class="LineNr">226 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L225" class="LineNr">225 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L226" class="LineNr">226 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L227" class="LineNr">227 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">))</span>
 <span id="L228" class="LineNr">228 </span>      emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L229" class="LineNr">229 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">))</span>
@@ -295,8 +295,8 @@ if ('onhashchange' in window) {
 <span id="L234" class="LineNr">234 </span><span class="Delimiter">}</span>
 <span id="L235" class="LineNr">235 </span>
 <span id="L236" class="LineNr">236 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L236'>add_imm_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">,</span> line&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L237" class="LineNr">237 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L238" class="LineNr">238 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L237" class="LineNr">237 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L238" class="LineNr">238 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L239" class="LineNr">239 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">))</span>
 <span id="L240" class="LineNr">240 </span>      emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L241" class="LineNr">241 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span>
@@ -306,230 +306,200 @@ if ('onhashchange' in window) {
 <span id="L245" class="LineNr">245 </span>
 <span id="L246" class="LineNr">246 </span><span class="Normal">void</span> emit_hex_bytes<span class="Delimiter">(</span>line&amp; out<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; w<span class="Delimiter">,</span> <span class="Normal">int</span> num<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L247" class="LineNr">247 </span>  assert<span class="Delimiter">(</span>num &lt;= <span class="Constant">4</span><span class="Delimiter">);</span>
-<span id="L248" class="LineNr">248 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>num == <span class="Constant">1</span> || !is_hex_int<span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L249" class="LineNr">249 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>w<span class="Delimiter">);</span>
-<span id="L250" class="LineNr">250 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L424'>is_hex_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">))</span>
-<span id="L251" class="LineNr">251 </span>      out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L118'>data</a> = <a href='030---operands.cc.html#L272'>hex_byte_to_string</a><span class="Delimiter">(</span><a href='030---operands.cc.html#L432'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">));</span>
+<span id="L248" class="LineNr">248 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>num == <span class="Constant">1</span> || !is_hex_int<span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L249" class="LineNr">249 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>w<span class="Delimiter">);</span>
+<span id="L250" class="LineNr">250 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L425'>is_hex_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">))</span>
+<span id="L251" class="LineNr">251 </span>      out<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L122'>data</a> = <a href='030---operands.cc.html#L272'>hex_byte_to_string</a><span class="Delimiter">(</span><a href='011run.cc.html#L308'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">));</span>
 <span id="L252" class="LineNr">252 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L253" class="LineNr">253 </span>  <span class="Delimiter">}</span>
-<span id="L254" class="LineNr">254 </span>  emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='030---operands.cc.html#L432'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">)),</span> num<span class="Delimiter">);</span>
+<span id="L254" class="LineNr">254 </span>  emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L308'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">)),</span> num<span class="Delimiter">);</span>
 <span id="L255" class="LineNr">255 </span><span class="Delimiter">}</span>
 <span id="L256" class="LineNr">256 </span>
 <span id="L257" class="LineNr">257 </span><span class="Normal">void</span> emit_hex_bytes<span class="Delimiter">(</span>line&amp; out<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> val<span class="Delimiter">,</span> <span class="Normal">int</span> num<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L258" class="LineNr">258 </span>  assert<span class="Delimiter">(</span>num &lt;= <span class="Constant">4</span><span class="Delimiter">);</span>
 <span id="L259" class="LineNr">259 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; num<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L260" class="LineNr">260 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L265'>hex_byte_text</a><span class="Delimiter">(</span>val &amp; <span class="Constant">0xff</span><span class="Delimiter">));</span>
+<span id="L260" class="LineNr">260 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L265'>hex_byte_text</a><span class="Delimiter">(</span>val &amp; <span class="Constant">0xff</span><span class="Delimiter">));</span>
 <span id="L261" class="LineNr">261 </span>    val = val &gt;&gt; <span class="Constant">8</span><span class="Delimiter">;</span>
 <span id="L262" class="LineNr">262 </span>  <span class="Delimiter">}</span>
 <span id="L263" class="LineNr">263 </span><span class="Delimiter">}</span>
 <span id="L264" class="LineNr">264 </span>
-<span id="L265" class="LineNr">265 </span><a href='011run.cc.html#L116'>word</a> <a href='030---operands.cc.html#L265'>hex_byte_text</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L266" class="LineNr">266 </span>  <a href='011run.cc.html#L116'>word</a> result<span class="Delimiter">;</span>
-<span id="L267" class="LineNr">267 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a> = <a href='030---operands.cc.html#L272'>hex_byte_to_string</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
+<span id="L265" class="LineNr">265 </span><a href='011run.cc.html#L120'>word</a> <a href='030---operands.cc.html#L265'>hex_byte_text</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L266" class="LineNr">266 </span>  <a href='011run.cc.html#L120'>word</a> result<span class="Delimiter">;</span>
+<span id="L267" class="LineNr">267 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> = <a href='030---operands.cc.html#L272'>hex_byte_to_string</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
 <span id="L268" class="LineNr">268 </span>  result<span class="Delimiter">.</span>original = result<span class="Delimiter">.</span>data+<span class="Constant">&quot;/auto&quot;</span><span class="Delimiter">;</span>
 <span id="L269" class="LineNr">269 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L270" class="LineNr">270 </span><span class="Delimiter">}</span>
 <span id="L271" class="LineNr">271 </span>
 <span id="L272" class="LineNr">272 </span>string <a href='030---operands.cc.html#L272'>hex_byte_to_string</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L273" class="LineNr">273 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L274" class="LineNr">274 </span>  out &lt;&lt; <a href='010---vm.cc.html#L259'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
-<span id="L275" class="LineNr">275 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L276" class="LineNr">276 </span><span class="Delimiter">}</span>
-<span id="L277" class="LineNr">277 </span>
-<span id="L278" class="LineNr">278 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> vector&lt;word&gt;&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L279" class="LineNr">279 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L280" class="LineNr">280 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L281" class="LineNr">281 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
-<span id="L282" class="LineNr">282 </span>    out &lt;&lt; in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">;</span>
-<span id="L283" class="LineNr">283 </span>  <span class="Delimiter">}</span>
-<span id="L284" class="LineNr">284 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L285" class="LineNr">285 </span><span class="Delimiter">}</span>
-<span id="L286" class="LineNr">286 </span>
-<span id="L287" class="LineNr">287 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
-<span id="L288" class="LineNr">288 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L288'>test_preserve_metadata_when_emitting_single_byte</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L289" class="LineNr">289 </span>  <a href='011run.cc.html#L116'>word</a> in<span class="Delimiter">;</span>
-<span id="L290" class="LineNr">290 </span>  in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a> = <span class="Constant">&quot;f0&quot;</span><span class="Delimiter">;</span>
-<span id="L291" class="LineNr">291 </span>  in<span class="Delimiter">.</span>original = <span class="Constant">&quot;f0/foo&quot;</span><span class="Delimiter">;</span>
-<span id="L292" class="LineNr">292 </span>  <a href='011run.cc.html#L110'>line</a> out<span class="Delimiter">;</span>
-<span id="L293" class="LineNr">293 </span>  emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> in<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L294" class="LineNr">294 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">,</span> <span class="Constant">&quot;f0&quot;</span><span class="Delimiter">);</span>
-<span id="L295" class="LineNr">295 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original<span class="Delimiter">,</span> <span class="Constant">&quot;f0/foo&quot;</span><span class="Delimiter">);</span>
-<span id="L296" class="LineNr">296 </span><span class="Delimiter">}</span>
-<span id="L297" class="LineNr">297 </span>
-<span id="L298" class="LineNr">298 </span><span class="Delimiter">:(scenario pack_disp8)</span>
-<span id="L299" class="LineNr">299 </span>== <span class="Constant">0x1</span>
-<span id="L300" class="LineNr">300 </span><span class="Constant">74</span> <span class="Constant">2</span>/disp8  <span class="Comment"># jump 2 bytes away if ZF is set</span>
-<span id="L301" class="LineNr">301 </span><span class="traceContains">+transform: packing instruction '74 2/disp8'</span>
-<span id="L302" class="LineNr">302 </span><span class="traceContains">+transform: instruction after packing: '74 02'</span>
-<span id="L303" class="LineNr">303 </span>
-<span id="L304" class="LineNr">304 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L305" class="LineNr">305 </span><span class="Delimiter">:(scenario pack_disp8_negative)</span>
-<span id="L306" class="LineNr">306 </span>== <span class="Constant">0x1</span>
-<span id="L307" class="LineNr">307 </span><span class="Comment"># running this will cause an infinite loop</span>
-<span id="L308" class="LineNr">308 </span><span class="Constant">74</span> -<span class="Constant">1</span>/disp8  <span class="Comment"># jump 1 byte before if ZF is set</span>
-<span id="L309" class="LineNr">309 </span><span class="traceContains">+transform: packing instruction '74 -1/disp8'</span>
-<span id="L310" class="LineNr">310 </span><span class="traceContains">+transform: instruction after packing: '74 ff'</span>
-<span id="L311" class="LineNr">311 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L312" class="LineNr">312 </span>
-<span id="L313" class="LineNr">313 </span><span class="Comment">//: helper for scenario</span>
-<span id="L314" class="LineNr">314 </span><span class="Delimiter">:(code)</span>
-<span id="L315" class="LineNr">315 </span><span class="Normal">void</span> <a href='011run.cc.html#L186'>transform</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L316" class="LineNr">316 </span>  <a href='011run.cc.html#L96'>program</a> p<span class="Delimiter">;</span>
-<span id="L317" class="LineNr">317 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
-<span id="L318" class="LineNr">318 </span>  <a href='011run.cc.html#L125'>parse</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L319" class="LineNr">319 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L320" class="LineNr">320 </span>  <a href='011run.cc.html#L186'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L321" class="LineNr">321 </span><span class="Delimiter">}</span>
-<span id="L322" class="LineNr">322 </span>
-<span id="L323" class="LineNr">323 </span><span class="Delimiter">:(scenario pack_modrm_imm32)</span>
-<span id="L324" class="LineNr">324 </span>== <span class="Constant">0x1</span>
-<span id="L325" class="LineNr">325 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L326" class="LineNr">326 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L327" class="LineNr">327 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L328" class="LineNr">328 </span>  <span class="Constant">81</span>          <span class="Constant">0</span>/add/subop         <span class="Constant">3</span>/mod/direct    <span class="Constant">3</span>/ebx/rm32                                                                      <span class="Constant">1</span>/imm32           <span class="Comment"># add 1 to EBX</span>
-<span id="L329" class="LineNr">329 </span><span class="traceContains">+transform: packing instruction '81 0/add/subop 3/mod/direct 3/ebx/rm32 1/imm32'</span>
-<span id="L330" class="LineNr">330 </span><span class="traceContains">+transform: instruction after packing: '81 c3 01 00 00 00'</span>
-<span id="L331" class="LineNr">331 </span>
-<span id="L332" class="LineNr">332 </span><span class="Delimiter">:(scenario pack_imm32_large)</span>
-<span id="L333" class="LineNr">333 </span>== <span class="Constant">0x1</span>
-<span id="L334" class="LineNr">334 </span>b9 <span class="Constant">0x080490a7</span>/imm32  <span class="Comment"># copy to ECX</span>
-<span id="L335" class="LineNr">335 </span><span class="traceContains">+transform: packing instruction 'b9 0x080490a7/imm32'</span>
-<span id="L336" class="LineNr">336 </span><span class="traceContains">+transform: instruction after packing: 'b9 a7 90 04 08'</span>
-<span id="L337" class="LineNr">337 </span>
-<span id="L338" class="LineNr">338 </span><span class="Delimiter">:(scenario pack_immediate_constants_hex)</span>
-<span id="L339" class="LineNr">339 </span>== <span class="Constant">0x1</span>
-<span id="L340" class="LineNr">340 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L341" class="LineNr">341 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L342" class="LineNr">342 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L343" class="LineNr">343 </span>  bb                                                                                                                              <span class="Constant">0x2a</span>/imm32        <span class="Comment"># copy 42 to EBX</span>
-<span id="L344" class="LineNr">344 </span><span class="traceContains">+transform: packing instruction 'bb 0x2a/imm32'</span>
-<span id="L345" class="LineNr">345 </span><span class="traceContains">+transform: instruction after packing: 'bb 2a 00 00 00'</span>
-<span id="L346" class="LineNr">346 </span><span class="traceContains">+run: copy <a href='011run.cc.html#L292'>imm32</a> 0x0000002a to <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L347" class="LineNr">347 </span>
-<span id="L348" class="LineNr">348 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L349" class="LineNr">349 </span><span class="Delimiter">:(scenario pack_silently_ignores_non_hex)</span>
-<span id="L350" class="LineNr">350 </span>== <span class="Constant">0x1</span>
-<span id="L351" class="LineNr">351 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L352" class="LineNr">352 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L353" class="LineNr">353 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L354" class="LineNr">354 </span>  bb                                                                                                                              foo/imm32         <span class="Comment"># copy foo to EBX</span>
-<span id="L355" class="LineNr">355 </span><span class="traceContains">+transform: packing instruction 'bb foo/imm32'</span>
-<span id="L356" class="LineNr">356 </span><span class="Comment"># no change (we're just not printing metadata to the trace)</span>
-<span id="L357" class="LineNr">357 </span><span class="traceContains">+transform: instruction after packing: 'bb foo'</span>
-<span id="L358" class="LineNr">358 </span>$error: <span class="Constant">0</span>
-<span id="L359" class="LineNr">359 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L360" class="LineNr">360 </span>
-<span id="L361" class="LineNr">361 </span><span class="SalientComment">//:: helpers</span>
-<span id="L362" class="LineNr">362 </span>
-<span id="L363" class="LineNr">363 </span><span class="Delimiter">:(code)</span>
-<span id="L364" class="LineNr">364 </span><span class="Normal">bool</span> all_hex_bytes<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L365" class="LineNr">365 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L366" class="LineNr">366 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
-<span id="L367" class="LineNr">367 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L368" class="LineNr">368 </span>  <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L369" class="LineNr">369 </span><span class="Delimiter">}</span>
-<span id="L370" class="LineNr">370 </span>
-<span id="L371" class="LineNr">371 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L371'>is_hex_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L372" class="LineNr">372 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L381'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
-<span id="L373" class="LineNr">373 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L374" class="LineNr">374 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span>
-<span id="L375" class="LineNr">375 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L376" class="LineNr">376 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">.</span>find_first_not_of<span class="Delimiter">(</span><span class="Constant">&quot;0123456789abcdefABCDEF&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span>
-<span id="L377" class="LineNr">377 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L378" class="LineNr">378 </span>  <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L379" class="LineNr">379 </span><span class="Delimiter">}</span>
-<span id="L380" class="LineNr">380 </span>
-<span id="L381" class="LineNr">381 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L381'>contains_any_operand_metadata</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; <a href='011run.cc.html#L116'>word</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L382" class="LineNr">382 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='011run.cc.html#L116'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L383" class="LineNr">383 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='011run.cc.html#L116'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> != <a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">())</span>
-<span id="L384" class="LineNr">384 </span>      <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L385" class="LineNr">385 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L386" class="LineNr">386 </span><span class="Delimiter">}</span>
-<span id="L387" class="LineNr">387 </span>
-<span id="L388" class="LineNr">388 </span><span class="Normal">bool</span> has_metadata<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L389" class="LineNr">389 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L390" class="LineNr">390 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L391" class="LineNr">391 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L392" class="LineNr">392 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L393" class="LineNr">393 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' has conflicting &quot;</span> &lt;&lt; m &lt;&lt; <span class="Constant">&quot; operands</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L394" class="LineNr">394 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L395" class="LineNr">395 </span>    <span class="Delimiter">}</span>
-<span id="L396" class="LineNr">396 </span>    result =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L397" class="LineNr">397 </span>  <span class="Delimiter">}</span>
-<span id="L398" class="LineNr">398 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L399" class="LineNr">399 </span><span class="Delimiter">}</span>
-<span id="L400" class="LineNr">400 </span>
-<span id="L401" class="LineNr">401 </span><span class="Normal">bool</span> has_metadata<span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L402" class="LineNr">402 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L403" class="LineNr">403 </span>  <span class="Normal">bool</span> metadata_found =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L404" class="LineNr">404 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L405" class="LineNr">405 </span>    <span class="Normal">const</span> string&amp; curr = w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L406" class="LineNr">406 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>find<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> == <a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
-<span id="L407" class="LineNr">407 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>metadata_found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L408" class="LineNr">408 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L409" class="LineNr">409 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L410" class="LineNr">410 </span>    <span class="Delimiter">}</span>
-<span id="L411" class="LineNr">411 </span>    metadata_found =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L412" class="LineNr">412 </span>    result = <span class="Delimiter">(</span>curr == m<span class="Delimiter">);</span>
-<span id="L413" class="LineNr">413 </span>  <span class="Delimiter">}</span>
-<span id="L414" class="LineNr">414 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L415" class="LineNr">415 </span><span class="Delimiter">}</span>
-<span id="L416" class="LineNr">416 </span>
-<span id="L417" class="LineNr">417 </span><a href='011run.cc.html#L116'>word</a> metadata<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L418" class="LineNr">418 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L419" class="LineNr">419 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span>
-<span id="L420" class="LineNr">420 </span>      <span class="Identifier">return</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L421" class="LineNr">421 </span>  assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
-<span id="L422" class="LineNr">422 </span><span class="Delimiter">}</span>
-<span id="L423" class="LineNr">423 </span>
-<span id="L424" class="LineNr">424 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L424'>is_hex_int</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L425" class="LineNr">425 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L426" class="LineNr">426 </span>  <span class="Normal">size_t</span> pos = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L427" class="LineNr">427 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> == <span class="Constant">'-'</span> || s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> == <span class="Constant">'+'</span><span class="Delimiter">)</span> pos++<span class="Delimiter">;</span>
-<span id="L428" class="LineNr">428 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span>pos<span class="Delimiter">,</span> pos+<span class="Constant">2</span><span class="Delimiter">)</span> == <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">)</span> pos += <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L429" class="LineNr">429 </span>  <span class="Identifier">return</span> s<span class="Delimiter">.</span>find_first_not_of<span class="Delimiter">(</span><span class="Constant">&quot;0123456789abcdefABCDEF&quot;</span><span class="Delimiter">,</span> pos<span class="Delimiter">)</span> == string::npos<span class="Delimiter">;</span>
-<span id="L430" class="LineNr">430 </span><span class="Delimiter">}</span>
-<span id="L431" class="LineNr">431 </span>
-<span id="L432" class="LineNr">432 </span><span class="Normal">int32_t</span> <a href='030---operands.cc.html#L432'>parse_int</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L433" class="LineNr">433 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L434" class="LineNr">434 </span>  istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
-<span id="L435" class="LineNr">435 </span>  in &gt;&gt; std::hex<span class="Delimiter">;</span>
-<span id="L436" class="LineNr">436 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> == <span class="Constant">'-'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L437" class="LineNr">437 </span>    <span class="Normal">int32_t</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L438" class="LineNr">438 </span>    in &gt;&gt; result<span class="Delimiter">;</span>
-<span id="L439" class="LineNr">439 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!in || !in<span class="Delimiter">.</span>eof<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L440" class="LineNr">440 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;not a number: &quot;</span> &lt;&lt; s &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L441" class="LineNr">441 </span>      <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L442" class="LineNr">442 </span>    <span class="Delimiter">}</span>
-<span id="L443" class="LineNr">443 </span>    <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L444" class="LineNr">444 </span>  <span class="Delimiter">}</span>
-<span id="L445" class="LineNr">445 </span>  <span class="Normal">uint32_t</span> uresult = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L446" class="LineNr">446 </span>  in &gt;&gt; uresult<span class="Delimiter">;</span>
-<span id="L447" class="LineNr">447 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!in || !in<span class="Delimiter">.</span>eof<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L448" class="LineNr">448 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;not a number: &quot;</span> &lt;&lt; s &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L449" class="LineNr">449 </span>    <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L450" class="LineNr">450 </span>  <span class="Delimiter">}</span>
-<span id="L451" class="LineNr">451 </span>  <span class="Identifier">return</span> <span class="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span>uresult<span class="Delimiter">);</span>
-<span id="L452" class="LineNr">452 </span><span class="Delimiter">}</span>
-<span id="L453" class="LineNr">453 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
-<span id="L454" class="LineNr">454 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L454'>test_parse_int</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L455" class="LineNr">455 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='030---operands.cc.html#L432'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0&quot;</span><span class="Delimiter">));</span>
-<span id="L456" class="LineNr">456 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='030---operands.cc.html#L432'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0x0&quot;</span><span class="Delimiter">));</span>
-<span id="L457" class="LineNr">457 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='030---operands.cc.html#L432'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0x0&quot;</span><span class="Delimiter">));</span>
-<span id="L458" class="LineNr">458 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">16</span><span class="Delimiter">,</span> <a href='030---operands.cc.html#L432'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;10&quot;</span><span class="Delimiter">));</span>  <span class="Comment">// hex always</span>
-<span id="L459" class="LineNr">459 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>-<span class="Constant">1</span><span class="Delimiter">,</span> <a href='030---operands.cc.html#L432'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;-1&quot;</span><span class="Delimiter">));</span>
-<span id="L460" class="LineNr">460 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>-<span class="Constant">1</span><span class="Delimiter">,</span> <a href='030---operands.cc.html#L432'>parse_int</a><span class="Delimiter">(</span><span class="Constant">&quot;0xffffffff&quot;</span><span class="Delimiter">));</span>
-<span id="L461" class="LineNr">461 </span><span class="Delimiter">}</span>
-<span id="L462" class="LineNr">462 </span>
-<span id="L463" class="LineNr">463 </span><span class="Delimiter">:(code)</span>
-<span id="L464" class="LineNr">464 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L465" class="LineNr">465 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L466" class="LineNr">466 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L467" class="LineNr">467 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
-<span id="L468" class="LineNr">468 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original<span class="Delimiter">;</span>
-<span id="L469" class="LineNr">469 </span>  <span class="Delimiter">}</span>
-<span id="L470" class="LineNr">470 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L471" class="LineNr">471 </span><span class="Delimiter">}</span>
+<span id="L274" class="LineNr">274 </span>  <span class="Comment">// uint8_t prints without padding, but int8_t will expand to 32 bits again</span>
+<span id="L275" class="LineNr">275 </span>  out &lt;&lt; <a href='010---vm.cc.html#L259'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
+<span id="L276" class="LineNr">276 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L277" class="LineNr">277 </span><span class="Delimiter">}</span>
+<span id="L278" class="LineNr">278 </span>
+<span id="L279" class="LineNr">279 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> vector&lt;word&gt;&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L280" class="LineNr">280 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L281" class="LineNr">281 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L282" class="LineNr">282 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
+<span id="L283" class="LineNr">283 </span>    out &lt;&lt; in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">;</span>
+<span id="L284" class="LineNr">284 </span>  <span class="Delimiter">}</span>
+<span id="L285" class="LineNr">285 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L286" class="LineNr">286 </span><span class="Delimiter">}</span>
+<span id="L287" class="LineNr">287 </span>
+<span id="L288" class="LineNr">288 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
+<span id="L289" class="LineNr">289 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L289'>test_preserve_metadata_when_emitting_single_byte</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L290" class="LineNr">290 </span>  <a href='011run.cc.html#L120'>word</a> in<span class="Delimiter">;</span>
+<span id="L291" class="LineNr">291 </span>  in<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> = <span class="Constant">&quot;f0&quot;</span><span class="Delimiter">;</span>
+<span id="L292" class="LineNr">292 </span>  in<span class="Delimiter">.</span>original = <span class="Constant">&quot;f0/foo&quot;</span><span class="Delimiter">;</span>
+<span id="L293" class="LineNr">293 </span>  <a href='011run.cc.html#L114'>line</a> out<span class="Delimiter">;</span>
+<span id="L294" class="LineNr">294 </span>  emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> in<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L295" class="LineNr">295 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">,</span> <span class="Constant">&quot;f0&quot;</span><span class="Delimiter">);</span>
+<span id="L296" class="LineNr">296 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original<span class="Delimiter">,</span> <span class="Constant">&quot;f0/foo&quot;</span><span class="Delimiter">);</span>
+<span id="L297" class="LineNr">297 </span><span class="Delimiter">}</span>
+<span id="L298" class="LineNr">298 </span>
+<span id="L299" class="LineNr">299 </span><span class="Delimiter">:(scenario pack_disp8)</span>
+<span id="L300" class="LineNr">300 </span>== <span class="Constant">0x1</span>
+<span id="L301" class="LineNr">301 </span><span class="Constant">74</span> <span class="Constant">2</span>/disp8  <span class="Comment"># jump 2 bytes away if ZF is set</span>
+<span id="L302" class="LineNr">302 </span><span class="traceContains">+transform: packing instruction '74 2/disp8'</span>
+<span id="L303" class="LineNr">303 </span><span class="traceContains">+transform: instruction after packing: '74 02'</span>
+<span id="L304" class="LineNr">304 </span>
+<span id="L305" class="LineNr">305 </span><span class="Delimiter">:(scenarios transform)</span>
+<span id="L306" class="LineNr">306 </span><span class="Delimiter">:(scenario pack_disp8_negative)</span>
+<span id="L307" class="LineNr">307 </span>== <span class="Constant">0x1</span>
+<span id="L308" class="LineNr">308 </span><span class="Comment"># running this will cause an infinite loop</span>
+<span id="L309" class="LineNr">309 </span><span class="Constant">74</span> -<span class="Constant">1</span>/disp8  <span class="Comment"># jump 1 byte before if ZF is set</span>
+<span id="L310" class="LineNr">310 </span><span class="traceContains">+transform: packing instruction '74 -1/disp8'</span>
+<span id="L311" class="LineNr">311 </span><span class="traceContains">+transform: instruction after packing: '74 ff'</span>
+<span id="L312" class="LineNr">312 </span><span class="Delimiter">:(scenarios run)</span>
+<span id="L313" class="LineNr">313 </span>
+<span id="L314" class="LineNr">314 </span><span class="Comment">//: helper for scenario</span>
+<span id="L315" class="LineNr">315 </span><span class="Delimiter">:(code)</span>
+<span id="L316" class="LineNr">316 </span><span class="Normal">void</span> <a href='011run.cc.html#L193'>transform</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L317" class="LineNr">317 </span>  <a href='011run.cc.html#L96'>program</a> p<span class="Delimiter">;</span>
+<span id="L318" class="LineNr">318 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
+<span id="L319" class="LineNr">319 </span>  <a href='011run.cc.html#L129'>parse</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
+<span id="L320" class="LineNr">320 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L321" class="LineNr">321 </span>  <a href='011run.cc.html#L193'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L322" class="LineNr">322 </span><span class="Delimiter">}</span>
+<span id="L323" class="LineNr">323 </span>
+<span id="L324" class="LineNr">324 </span><span class="Delimiter">:(scenario pack_modrm_imm32)</span>
+<span id="L325" class="LineNr">325 </span>== <span class="Constant">0x1</span>
+<span id="L326" class="LineNr">326 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L327" class="LineNr">327 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L328" class="LineNr">328 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L329" class="LineNr">329 </span>  <span class="Constant">81</span>          <span class="Constant">0</span>/add/subop         <span class="Constant">3</span>/mod/direct    <span class="Constant">3</span>/ebx/rm32                                                                      <span class="Constant">1</span>/imm32           <span class="Comment"># add 1 to EBX</span>
+<span id="L330" class="LineNr">330 </span><span class="traceContains">+transform: packing instruction '81 0/add/subop 3/mod/direct 3/ebx/rm32 1/imm32'</span>
+<span id="L331" class="LineNr">331 </span><span class="traceContains">+transform: instruction after packing: '81 c3 01 00 00 00'</span>
+<span id="L332" class="LineNr">332 </span>
+<span id="L333" class="LineNr">333 </span><span class="Delimiter">:(scenario pack_imm32_large)</span>
+<span id="L334" class="LineNr">334 </span>== <span class="Constant">0x1</span>
+<span id="L335" class="LineNr">335 </span>b9 <span class="Constant">0x080490a7</span>/imm32  <span class="Comment"># copy to ECX</span>
+<span id="L336" class="LineNr">336 </span><span class="traceContains">+transform: packing instruction 'b9 0x080490a7/imm32'</span>
+<span id="L337" class="LineNr">337 </span><span class="traceContains">+transform: instruction after packing: 'b9 a7 90 04 08'</span>
+<span id="L338" class="LineNr">338 </span>
+<span id="L339" class="LineNr">339 </span><span class="Delimiter">:(scenario pack_immediate_constants_hex)</span>
+<span id="L340" class="LineNr">340 </span>== <span class="Constant">0x1</span>
+<span id="L341" class="LineNr">341 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L342" class="LineNr">342 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L343" class="LineNr">343 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L344" class="LineNr">344 </span>  bb                                                                                                                              <span class="Constant">0x2a</span>/imm32        <span class="Comment"># copy 42 to EBX</span>
+<span id="L345" class="LineNr">345 </span><span class="traceContains">+transform: packing instruction 'bb 0x2a/imm32'</span>
+<span id="L346" class="LineNr">346 </span><span class="traceContains">+transform: instruction after packing: 'bb 2a 00 00 00'</span>
+<span id="L347" class="LineNr">347 </span><span class="traceContains">+run: copy <a href='011run.cc.html#L299'>imm32</a> 0x0000002a to <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L348" class="LineNr">348 </span>
+<span id="L349" class="LineNr">349 </span><span class="Delimiter">:(scenarios transform)</span>
+<span id="L350" class="LineNr">350 </span><span class="Delimiter">:(scenario pack_silently_ignores_non_hex)</span>
+<span id="L351" class="LineNr">351 </span>== <span class="Constant">0x1</span>
+<span id="L352" class="LineNr">352 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L353" class="LineNr">353 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L354" class="LineNr">354 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L355" class="LineNr">355 </span>  bb                                                                                                                              foo/imm32         <span class="Comment"># copy foo to EBX</span>
+<span id="L356" class="LineNr">356 </span><span class="traceContains">+transform: packing instruction 'bb foo/imm32'</span>
+<span id="L357" class="LineNr">357 </span><span class="Comment"># no change (we're just not printing metadata to the trace)</span>
+<span id="L358" class="LineNr">358 </span><span class="traceContains">+transform: instruction after packing: 'bb foo'</span>
+<span id="L359" class="LineNr">359 </span>$error: <span class="Constant">0</span>
+<span id="L360" class="LineNr">360 </span><span class="Delimiter">:(scenarios run)</span>
+<span id="L361" class="LineNr">361 </span>
+<span id="L362" class="LineNr">362 </span><span class="SalientComment">//:: helpers</span>
+<span id="L363" class="LineNr">363 </span>
+<span id="L364" class="LineNr">364 </span><span class="Delimiter">:(code)</span>
+<span id="L365" class="LineNr">365 </span><span class="Normal">bool</span> all_hex_bytes<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L366" class="LineNr">366 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L367" class="LineNr">367 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
+<span id="L368" class="LineNr">368 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L369" class="LineNr">369 </span>  <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L370" class="LineNr">370 </span><span class="Delimiter">}</span>
+<span id="L371" class="LineNr">371 </span>
+<span id="L372" class="LineNr">372 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L372'>is_hex_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L373" class="LineNr">373 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L382'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
+<span id="L374" class="LineNr">374 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L375" class="LineNr">375 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span>
+<span id="L376" class="LineNr">376 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L377" class="LineNr">377 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">.</span>find_first_not_of<span class="Delimiter">(</span><span class="Constant">&quot;0123456789abcdefABCDEF&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span>
+<span id="L378" class="LineNr">378 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L379" class="LineNr">379 </span>  <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L380" class="LineNr">380 </span><span class="Delimiter">}</span>
+<span id="L381" class="LineNr">381 </span>
+<span id="L382" class="LineNr">382 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L382'>contains_any_operand_metadata</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; <a href='011run.cc.html#L120'>word</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L383" class="LineNr">383 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='011run.cc.html#L120'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L384" class="LineNr">384 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='011run.cc.html#L120'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> != <a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">())</span>
+<span id="L385" class="LineNr">385 </span>      <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L386" class="LineNr">386 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L387" class="LineNr">387 </span><span class="Delimiter">}</span>
+<span id="L388" class="LineNr">388 </span>
+<span id="L389" class="LineNr">389 </span><span class="Normal">bool</span> has_metadata<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L390" class="LineNr">390 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L391" class="LineNr">391 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L392" class="LineNr">392 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L393" class="LineNr">393 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L394" class="LineNr">394 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' has conflicting &quot;</span> &lt;&lt; m &lt;&lt; <span class="Constant">&quot; operands</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L395" class="LineNr">395 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L396" class="LineNr">396 </span>    <span class="Delimiter">}</span>
+<span id="L397" class="LineNr">397 </span>    result =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L398" class="LineNr">398 </span>  <span class="Delimiter">}</span>
+<span id="L399" class="LineNr">399 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L400" class="LineNr">400 </span><span class="Delimiter">}</span>
+<span id="L401" class="LineNr">401 </span>
+<span id="L402" class="LineNr">402 </span><span class="Normal">bool</span> has_metadata<span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L403" class="LineNr">403 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L404" class="LineNr">404 </span>  <span class="Normal">bool</span> metadata_found =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L405" class="LineNr">405 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L406" class="LineNr">406 </span>    <span class="Normal">const</span> string&amp; curr = w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L407" class="LineNr">407 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>find<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> == <a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
+<span id="L408" class="LineNr">408 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>metadata_found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L409" class="LineNr">409 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L410" class="LineNr">410 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L411" class="LineNr">411 </span>    <span class="Delimiter">}</span>
+<span id="L412" class="LineNr">412 </span>    metadata_found =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L413" class="LineNr">413 </span>    result = <span class="Delimiter">(</span>curr == m<span class="Delimiter">);</span>
+<span id="L414" class="LineNr">414 </span>  <span class="Delimiter">}</span>
+<span id="L415" class="LineNr">415 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L416" class="LineNr">416 </span><span class="Delimiter">}</span>
+<span id="L417" class="LineNr">417 </span>
+<span id="L418" class="LineNr">418 </span><a href='011run.cc.html#L120'>word</a> metadata<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L419" class="LineNr">419 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L420" class="LineNr">420 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span>
+<span id="L421" class="LineNr">421 </span>      <span class="Identifier">return</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L422" class="LineNr">422 </span>  assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
+<span id="L423" class="LineNr">423 </span><span class="Delimiter">}</span>
+<span id="L424" class="LineNr">424 </span>
+<span id="L425" class="LineNr">425 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L425'>is_hex_int</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L426" class="LineNr">426 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L427" class="LineNr">427 </span>  <span class="Normal">size_t</span> pos = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L428" class="LineNr">428 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> == <span class="Constant">'-'</span> || s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> == <span class="Constant">'+'</span><span class="Delimiter">)</span> pos++<span class="Delimiter">;</span>
+<span id="L429" class="LineNr">429 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span>pos<span class="Delimiter">,</span> pos+<span class="Constant">2</span><span class="Delimiter">)</span> == <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">)</span> pos += <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L430" class="LineNr">430 </span>  <span class="Identifier">return</span> s<span class="Delimiter">.</span>find_first_not_of<span class="Delimiter">(</span><span class="Constant">&quot;0123456789abcdefABCDEF&quot;</span><span class="Delimiter">,</span> pos<span class="Delimiter">)</span> == string::npos<span class="Delimiter">;</span>
+<span id="L431" class="LineNr">431 </span><span class="Delimiter">}</span>
+<span id="L432" class="LineNr">432 </span>
+<span id="L433" class="LineNr">433 </span><span class="Delimiter">:(code)</span>
+<span id="L434" class="LineNr">434 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L435" class="LineNr">435 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L436" class="LineNr">436 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L437" class="LineNr">437 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
+<span id="L438" class="LineNr">438 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original<span class="Delimiter">;</span>
+<span id="L439" class="LineNr">439 </span>  <span class="Delimiter">}</span>
+<span id="L440" class="LineNr">440 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L441" class="LineNr">441 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/031check_operands.cc.html b/html/subx/031check_operands.cc.html
index 09f55a7c..73dacb99 100644
--- a/html/subx/031check_operands.cc.html
+++ b/html/subx/031check_operands.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/031check_operands.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .CommentedCode { color: #6c6c6c; }
+.PreProc { color: #800080; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.traceContains { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 -->
 </style>
 
@@ -75,45 +75,45 @@ if ('onhashchange' in window) {
 <span id="L11" class="LineNr"> 11 </span><span class="traceContains">+error: 'cd' (software interrupt): missing imm8 operand</span>
 <span id="L12" class="LineNr"> 12 </span>
 <span id="L13" class="LineNr"> 13 </span><span class="Delimiter">:(before &quot;Pack Operands(segment code)&quot;)</span>
-<span id="L14" class="LineNr"> 14 </span>check_operands<span class="Delimiter">(</span>code<span class="Delimiter">);</span>
+<span id="L14" class="LineNr"> 14 </span>check_operands<span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">);</span>
 <span id="L15" class="LineNr"> 15 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L16" class="LineNr"> 16 </span>
 <span id="L17" class="LineNr"> 17 </span><span class="Delimiter">:(code)</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; code<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L18" class="LineNr"> 18 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L19" class="LineNr"> 19 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check operands&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L20" class="LineNr"> 20 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L21" class="LineNr"> 21 </span>    check_operands<span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L20" class="LineNr"> 20 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L21" class="LineNr"> 21 </span>    check_operands<span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L22" class="LineNr"> 22 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// stop at the first mal-formed instruction</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Delimiter">}</span>
 <span id="L24" class="LineNr"> 24 </span><span class="Delimiter">}</span>
 <span id="L25" class="LineNr"> 25 </span>
 <span id="L26" class="LineNr"> 26 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L27" class="LineNr"> 27 </span>  <a href='011run.cc.html#L116'>word</a> op = <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
-<span id="L28" class="LineNr"> 28 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L29" class="LineNr"> 29 </span>    <a href='031check_operands.cc.html#L483'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L27" class="LineNr"> 27 </span>  <a href='011run.cc.html#L120'>word</a> op = <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L29" class="LineNr"> 29 </span>    <a href='031check_operands.cc.html#L485'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
 <span id="L30" class="LineNr"> 30 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L31" class="LineNr"> 31 </span>  <span class="Delimiter">}</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L33" class="LineNr"> 33 </span>    <a href='031check_operands.cc.html#L451'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L33" class="LineNr"> 33 </span>    <a href='031check_operands.cc.html#L453'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
 <span id="L34" class="LineNr"> 34 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Delimiter">}</span>
 <span id="L36" class="LineNr"> 36 </span>  check_operands<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
 <span id="L37" class="LineNr"> 37 </span><span class="Delimiter">}</span>
 <span id="L38" class="LineNr"> 38 </span>
-<span id="L39" class="LineNr"> 39 </span><a href='011run.cc.html#L116'>word</a> <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span><a href='011run.cc.html#L116'>word</a><span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L40" class="LineNr"> 40 </span>  op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a> = <a href='031check_operands.cc.html#L508'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
+<span id="L39" class="LineNr"> 39 </span><a href='011run.cc.html#L120'>word</a> <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span><a href='011run.cc.html#L120'>word</a><span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L40" class="LineNr"> 40 </span>  op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> = <a href='031check_operands.cc.html#L510'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
 <span id="L41" class="LineNr"> 41 </span>  <span class="Comment">// opcodes can't be negative</span>
-<span id="L42" class="LineNr"> 42 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span>
-<span id="L43" class="LineNr"> 43 </span>    op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a> = op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span>
-<span id="L45" class="LineNr"> 45 </span>    op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a> = string<span class="Delimiter">(</span><span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span>+op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">;</span>
+<span id="L42" class="LineNr"> 42 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span>
+<span id="L43" class="LineNr"> 43 </span>    op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> = op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span>
+<span id="L45" class="LineNr"> 45 </span>    op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> = string<span class="Delimiter">(</span><span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span>+op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">;</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Identifier">return</span> op<span class="Delimiter">;</span>
 <span id="L47" class="LineNr"> 47 </span><span class="Delimiter">}</span>
 <span id="L48" class="LineNr"> 48 </span>
 <span id="L49" class="LineNr"> 49 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L49'>test_preprocess_op</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L50" class="LineNr"> 50 </span>  <a href='011run.cc.html#L116'>word</a> w1<span class="Delimiter">;</span>  w1<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a> = <span class="Constant">&quot;0xf&quot;</span><span class="Delimiter">;</span>
-<span id="L51" class="LineNr"> 51 </span>  <a href='011run.cc.html#L116'>word</a> w2<span class="Delimiter">;</span>  w2<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a> = <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">;</span>
-<span id="L52" class="LineNr"> 52 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>w1<span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">,</span> <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>w2<span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">);</span>
+<span id="L50" class="LineNr"> 50 </span>  <a href='011run.cc.html#L120'>word</a> w1<span class="Delimiter">;</span>  w1<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> = <span class="Constant">&quot;0xf&quot;</span><span class="Delimiter">;</span>
+<span id="L51" class="LineNr"> 51 </span>  <a href='011run.cc.html#L120'>word</a> w2<span class="Delimiter">;</span>  w2<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> = <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">;</span>
+<span id="L52" class="LineNr"> 52 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>w1<span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">,</span> <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>w2<span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
 <span id="L53" class="LineNr"> 53 </span><span class="Delimiter">}</span>
 <span id="L54" class="LineNr"> 54 </span>
 <span id="L55" class="LineNr"> 55 </span><span class="Comment">//: To check the operands for an opcode, we'll track the permitted operands</span>
@@ -141,7 +141,7 @@ if ('onhashchange' in window) {
 <span id="L77" class="LineNr"> 77 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L77'>init_op_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L78" class="LineNr"> 78 </span>  assert<span class="Delimiter">(</span><a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a> &lt;= <span class="Comment">/*</span><span class="Comment">bits in a uint8_t</span><span class="Comment">*/</span><span class="Constant">8</span><span class="Delimiter">);</span>
 <span id="L79" class="LineNr"> 79 </span>  <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">);</span>
-<span id="L80" class="LineNr"> 80 </span><span class="PreProc">  </span><span class="Comment">#define DEF(type) Operand_type_name.at(type) = tolower(#type), put(Operand_type, tolower(#type), type);</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Comment">#define DEF(type) Operand_type_name.at(type) = tolower(#type), put(Operand_type, tolower(#type), type);</span>
 <span id="L81" class="LineNr"> 81 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">);</span>
 <span id="L82" class="LineNr"> 82 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L63'>SUBOP</a><span class="Delimiter">);</span>
 <span id="L83" class="LineNr"> 83 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L64'>DISP8</a><span class="Delimiter">);</span>
@@ -149,7 +149,7 @@ if ('onhashchange' in window) {
 <span id="L85" class="LineNr"> 85 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L66'>DISP32</a><span class="Delimiter">);</span>
 <span id="L86" class="LineNr"> 86 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L67'>IMM8</a><span class="Delimiter">);</span>
 <span id="L87" class="LineNr"> 87 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L68'>IMM32</a><span class="Delimiter">);</span>
-<span id="L88" class="LineNr"> 88 </span><span class="PreProc">  </span><span class="Comment">#undef DEF</span>
+<span id="L88" class="LineNr"> 88 </span>  <span class="Comment">#undef DEF</span>
 <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span>
 <span id="L91" class="LineNr"> 91 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
@@ -256,332 +256,334 @@ if ('onhashchange' in window) {
 <span id="L192" class="LineNr">192 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
 <span id="L193" class="LineNr">193 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
 <span id="L194" class="LineNr">194 </span>  <span class="Comment">// copy</span>
-<span id="L195" class="LineNr">195 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L196" class="LineNr">196 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L197" class="LineNr">197 </span>  <span class="Comment">// swap</span>
-<span id="L198" class="LineNr">198 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L199" class="LineNr">199 </span>  <span class="Comment">// pop</span>
-<span id="L200" class="LineNr">200 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L201" class="LineNr">201 </span>
-<span id="L202" class="LineNr">202 </span>  <span class="SalientComment">//// Class O: op, ModR/M and subop (not r32)</span>
-<span id="L203" class="LineNr">203 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L204" class="LineNr">204 </span>  <span class="Comment">//  0     0     0      |0       0     1     1</span>
-<span id="L205" class="LineNr">205 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// jump/push/call</span>
-<span id="L206" class="LineNr">206 </span>
-<span id="L207" class="LineNr">207 </span>  <span class="SalientComment">//// Class N: op, ModR/M and imm32</span>
-<span id="L208" class="LineNr">208 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L209" class="LineNr">209 </span>  <span class="Comment">//  1     0     0      |0       0     0     1</span>
-<span id="L210" class="LineNr">210 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x41</span><span class="Delimiter">);</span>  <span class="Comment">// copy</span>
-<span id="L211" class="LineNr">211 </span>
-<span id="L212" class="LineNr">212 </span>  <span class="SalientComment">//// Class P: op, ModR/M, subop (not r32) and imm32</span>
-<span id="L213" class="LineNr">213 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L214" class="LineNr">214 </span>  <span class="Comment">//  1     0     0      |0       0     1     1</span>
-<span id="L215" class="LineNr">215 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
-<span id="L216" class="LineNr">216 </span>
-<span id="L217" class="LineNr">217 </span>  <span class="Comment">// End Init Permitted Operands</span>
-<span id="L218" class="LineNr">218 </span><span class="Delimiter">}</span>
-<span id="L219" class="LineNr">219 </span>
-<span id="L220" class="LineNr">220 </span><span class="Delimiter">:(code)</span>
-<span id="L221" class="LineNr">221 </span><span class="Comment">#define HAS(bitvector, bit)  ((bitvector) &amp; (1 &lt;&lt; (bit)))</span>
-<span id="L222" class="LineNr">222 </span><span class="Comment">#define SET(bitvector, bit)  ((bitvector) | (1 &lt;&lt; (bit)))</span>
-<span id="L223" class="LineNr">223 </span><span class="Comment">#define CLEAR(bitvector, bit)  ((bitvector) &amp; (~(1 &lt;&lt; (bit))))</span>
-<span id="L224" class="LineNr">224 </span>
-<span id="L225" class="LineNr">225 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L226" class="LineNr">226 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L227" class="LineNr">227 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">);</span>
-<span id="L228" class="LineNr">228 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L229" class="LineNr">229 </span>    <a href='031check_operands.cc.html#L321'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L230" class="LineNr">230 </span>    <a href='031check_operands.cc.html#L348'>compare_bitvector_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L231" class="LineNr">231 </span>  <span class="Delimiter">}</span>
-<span id="L232" class="LineNr">232 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L233" class="LineNr">233 </span>    <a href='031check_operands.cc.html#L239'>compare_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L234" class="LineNr">234 </span>  <span class="Delimiter">}</span>
-<span id="L235" class="LineNr">235 </span><span class="Delimiter">}</span>
-<span id="L236" class="LineNr">236 </span>
-<span id="L237" class="LineNr">237 </span><span class="Comment">//: Many instructions can be checked just by comparing bitvectors.</span>
+<span id="L195" class="LineNr">195 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;88&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L196" class="LineNr">196 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L197" class="LineNr">197 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;8a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L198" class="LineNr">198 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L199" class="LineNr">199 </span>  <span class="Comment">// swap</span>
+<span id="L200" class="LineNr">200 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Comment">// pop</span>
+<span id="L202" class="LineNr">202 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L203" class="LineNr">203 </span>
+<span id="L204" class="LineNr">204 </span>  <span class="SalientComment">//// Class O: op, ModR/M and subop (not r32)</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L206" class="LineNr">206 </span>  <span class="Comment">//  0     0     0      |0       0     1     1</span>
+<span id="L207" class="LineNr">207 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// jump/push/call</span>
+<span id="L208" class="LineNr">208 </span>
+<span id="L209" class="LineNr">209 </span>  <span class="SalientComment">//// Class N: op, ModR/M and imm32</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L211" class="LineNr">211 </span>  <span class="Comment">//  1     0     0      |0       0     0     1</span>
+<span id="L212" class="LineNr">212 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x41</span><span class="Delimiter">);</span>  <span class="Comment">// copy</span>
+<span id="L213" class="LineNr">213 </span>
+<span id="L214" class="LineNr">214 </span>  <span class="SalientComment">//// Class P: op, ModR/M, subop (not r32) and imm32</span>
+<span id="L215" class="LineNr">215 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L216" class="LineNr">216 </span>  <span class="Comment">//  1     0     0      |0       0     1     1</span>
+<span id="L217" class="LineNr">217 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
+<span id="L218" class="LineNr">218 </span>
+<span id="L219" class="LineNr">219 </span>  <span class="Comment">// End Init Permitted Operands</span>
+<span id="L220" class="LineNr">220 </span><span class="Delimiter">}</span>
+<span id="L221" class="LineNr">221 </span>
+<span id="L222" class="LineNr">222 </span><span class="Delimiter">:(code)</span>
+<span id="L223" class="LineNr">223 </span><span class="Comment">#define HAS(bitvector, bit)  ((bitvector) &amp; (1 &lt;&lt; (bit)))</span>
+<span id="L224" class="LineNr">224 </span><span class="Comment">#define SET(bitvector, bit)  ((bitvector) | (1 &lt;&lt; (bit)))</span>
+<span id="L225" class="LineNr">225 </span><span class="Comment">#define CLEAR(bitvector, bit)  ((bitvector) &amp; (~(1 &lt;&lt; (bit))))</span>
+<span id="L226" class="LineNr">226 </span>
+<span id="L227" class="LineNr">227 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L228" class="LineNr">228 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L229" class="LineNr">229 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
+<span id="L230" class="LineNr">230 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L231" class="LineNr">231 </span>    <a href='031check_operands.cc.html#L323'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L232" class="LineNr">232 </span>    <a href='031check_operands.cc.html#L350'>compare_bitvector_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L233" class="LineNr">233 </span>  <span class="Delimiter">}</span>
+<span id="L234" class="LineNr">234 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L235" class="LineNr">235 </span>    <a href='031check_operands.cc.html#L241'>compare_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L236" class="LineNr">236 </span>  <span class="Delimiter">}</span>
+<span id="L237" class="LineNr">237 </span><span class="Delimiter">}</span>
 <span id="L238" class="LineNr">238 </span>
-<span id="L239" class="LineNr">239 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L239'>compare_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L240" class="LineNr">240 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L272'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L241" class="LineNr">241 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L263'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L242" class="LineNr">242 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L243" class="LineNr">243 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
-<span id="L244" class="LineNr">244 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L245" class="LineNr">245 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
-<span id="L246" class="LineNr">246 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
-<span id="L247" class="LineNr">247 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L248" class="LineNr">248 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
-<span id="L249" class="LineNr">249 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L257'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L250" class="LineNr">250 </span>    <span class="Normal">else</span>
-<span id="L251" class="LineNr">251 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L257'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L252" class="LineNr">252 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L253" class="LineNr">253 </span>  <span class="Delimiter">}</span>
-<span id="L254" class="LineNr">254 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L255" class="LineNr">255 </span><span class="Delimiter">}</span>
-<span id="L256" class="LineNr">256 </span>
-<span id="L257" class="LineNr">257 </span>string <a href='031check_operands.cc.html#L257'>maybe_name</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L258" class="LineNr">258 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L259" class="LineNr">259 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L260" class="LineNr">260 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">)</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
-<span id="L261" class="LineNr">261 </span><span class="Delimiter">}</span>
-<span id="L262" class="LineNr">262 </span>
-<span id="L263" class="LineNr">263 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L263'>compute_operand_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L264" class="LineNr">264 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L265" class="LineNr">265 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L266" class="LineNr">266 </span>    bitvector = bitvector | <a href='031check_operands.cc.html#L289'>bitvector_for_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L267" class="LineNr">267 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L93'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L268" class="LineNr">268 </span>  <span class="Delimiter">}</span>
-<span id="L269" class="LineNr">269 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
-<span id="L270" class="LineNr">270 </span><span class="Delimiter">}</span>
-<span id="L271" class="LineNr">271 </span>
-<span id="L272" class="LineNr">272 </span><span class="Normal">bool</span> <a href='031check_operands.cc.html#L272'>has_operands</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L273" class="LineNr">273 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">)</span> &gt; <a href='031check_operands.cc.html#L276'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L274" class="LineNr">274 </span><span class="Delimiter">}</span>
-<span id="L275" class="LineNr">275 </span>
-<span id="L276" class="LineNr">276 </span><span class="Normal">int</span> <a href='031check_operands.cc.html#L276'>first_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L277" class="LineNr">277 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L278" class="LineNr">278 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;f2&quot;</span> || inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L279" class="LineNr">279 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
-<span id="L280" class="LineNr">280 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
-<span id="L281" class="LineNr">281 </span>    <span class="Normal">else</span>
-<span id="L282" class="LineNr">282 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L283" class="LineNr">283 </span>  <span class="Delimiter">}</span>
-<span id="L284" class="LineNr">284 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L285" class="LineNr">285 </span><span class="Delimiter">}</span>
-<span id="L286" class="LineNr">286 </span>
-<span id="L287" class="LineNr">287 </span><span class="Comment">// Scan the metadata of 'w' and return the bit corresponding to any operand type.</span>
-<span id="L288" class="LineNr">288 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
-<span id="L289" class="LineNr">289 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L289'>bitvector_for_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L290" class="LineNr">290 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L291" class="LineNr">291 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L292" class="LineNr">292 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L293" class="LineNr">293 </span>    <span class="Normal">const</span> string&amp; curr = w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L294" class="LineNr">294 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='031check_operands.cc.html#L73'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
-<span id="L295" class="LineNr">295 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L296" class="LineNr">296 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L297" class="LineNr">297 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L93'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
-<span id="L298" class="LineNr">298 </span>    <span class="Delimiter">}</span>
-<span id="L299" class="LineNr">299 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L73'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">));</span>
-<span id="L300" class="LineNr">300 </span>    found =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L301" class="LineNr">301 </span>  <span class="Delimiter">}</span>
-<span id="L302" class="LineNr">302 </span>  <span class="Identifier">return</span> bv<span class="Delimiter">;</span>
-<span id="L303" class="LineNr">303 </span><span class="Delimiter">}</span>
-<span id="L304" class="LineNr">304 </span>
-<span id="L305" class="LineNr">305 </span><span class="Delimiter">:(scenario conflicting_operand_type)</span>
-<span id="L306" class="LineNr">306 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L307" class="LineNr">307 </span>== <span class="Constant">0x1</span>
-<span id="L308" class="LineNr">308 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
-<span id="L309" class="LineNr">309 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
-<span id="L310" class="LineNr">310 </span>
-<span id="L311" class="LineNr">311 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
-<span id="L312" class="LineNr">312 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
-<span id="L313" class="LineNr">313 </span>
-<span id="L314" class="LineNr">314 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
-<span id="L315" class="LineNr">315 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L316" class="LineNr">316 </span>== <span class="Constant">0x1</span>
-<span id="L317" class="LineNr">317 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop       <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
-<span id="L318" class="LineNr">318 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with <a href='011run.cc.html#L292'>imm32</a> based on subop): missing mod operand</span>
-<span id="L319" class="LineNr">319 </span>
-<span id="L320" class="LineNr">320 </span><span class="Delimiter">:(code)</span>
-<span id="L321" class="LineNr">321 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L321'>check_operands_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L322" class="LineNr">322 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L323" class="LineNr">323 </span>  <a href='031check_operands.cc.html#L368'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L324" class="LineNr">324 </span>  <a href='031check_operands.cc.html#L368'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L325" class="LineNr">325 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
-<span id="L326" class="LineNr">326 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;81&quot;</span> || op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;8f&quot;</span> || op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// keep sync'd with 'help subop'</span>
-<span id="L327" class="LineNr">327 </span>    <a href='031check_operands.cc.html#L368'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L328" class="LineNr">328 </span>    <a href='031check_operands.cc.html#L373'>check_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;should be replaced by subop&quot;</span><span class="Delimiter">);</span>
-<span id="L329" class="LineNr">329 </span>  <span class="Delimiter">}</span>
-<span id="L330" class="LineNr">330 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L331" class="LineNr">331 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a> != <span class="Constant">&quot;4&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L332" class="LineNr">332 </span>  <span class="Comment">// SIB byte checks</span>
-<span id="L333" class="LineNr">333 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L222'>hex_byte</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">);</span>
-<span id="L334" class="LineNr">334 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Comment">/*</span><span class="Comment">direct</span><span class="Comment">*/</span><span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L335" class="LineNr">335 </span>    <a href='031check_operands.cc.html#L368'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L336" class="LineNr">336 </span>    <a href='031check_operands.cc.html#L368'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>  <span class="Comment">// otherwise why go to SIB?</span>
-<span id="L337" class="LineNr">337 </span>  <span class="Delimiter">}</span>
-<span id="L338" class="LineNr">338 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L339" class="LineNr">339 </span>    <a href='031check_operands.cc.html#L373'>check_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
-<span id="L340" class="LineNr">340 </span>    <a href='031check_operands.cc.html#L373'>check_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
-<span id="L341" class="LineNr">341 </span>  <span class="Delimiter">}</span>
-<span id="L342" class="LineNr">342 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span>
-<span id="L343" class="LineNr">343 </span><span class="Delimiter">}</span>
-<span id="L344" class="LineNr">344 </span>
-<span id="L345" class="LineNr">345 </span><span class="Comment">// same as compare_bitvector, with a couple of exceptions for modrm-based instructions</span>
-<span id="L346" class="LineNr">346 </span><span class="Comment">//   exception 1: ignore modrm bit since we already checked it above</span>
-<span id="L347" class="LineNr">347 </span><span class="Comment">//   exception 2: modrm instructions can use a displacement on occasion</span>
-<span id="L348" class="LineNr">348 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L348'>compare_bitvector_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L349" class="LineNr">349 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L272'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L350" class="LineNr">350 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L263'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L352" class="LineNr">352 </span>  expected = CLEAR<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">);</span>  <span class="Comment">// exception 1</span>
-<span id="L353" class="LineNr">353 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
-<span id="L354" class="LineNr">354 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L355" class="LineNr">355 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing for modrm &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
-<span id="L356" class="LineNr">356 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
-<span id="L357" class="LineNr">357 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L64'>DISP8</a> || i == <a href='031check_operands.cc.html#L66'>DISP32</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
-<span id="L358" class="LineNr">358 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L359" class="LineNr">359 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
-<span id="L360" class="LineNr">360 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L257'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L361" class="LineNr">361 </span>    <span class="Normal">else</span>
-<span id="L362" class="LineNr">362 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L257'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L363" class="LineNr">363 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L364" class="LineNr">364 </span>  <span class="Delimiter">}</span>
-<span id="L365" class="LineNr">365 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L366" class="LineNr">366 </span><span class="Delimiter">}</span>
-<span id="L367" class="LineNr">367 </span>
-<span id="L368" class="LineNr">368 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L368'>check_metadata_present</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L369" class="LineNr">369 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
-<span id="L370" class="LineNr">370 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): missing &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L371" class="LineNr">371 </span><span class="Delimiter">}</span>
-<span id="L372" class="LineNr">372 </span>
-<span id="L373" class="LineNr">373 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L373'>check_metadata_absent</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; msg<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L374" class="LineNr">374 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
-<span id="L375" class="LineNr">375 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): unexpected &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand (&quot;</span> &lt;&lt; msg &lt;&lt; <span class="Constant">&quot;)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L376" class="LineNr">376 </span><span class="Delimiter">}</span>
-<span id="L377" class="LineNr">377 </span>
-<span id="L378" class="LineNr">378 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L379" class="LineNr">379 </span><span class="Delimiter">:(scenario modrm_with_displacement)</span>
-<span id="L380" class="LineNr">380 </span><span class="Special">% Reg[EAX].u = 0x1;</span>
-<span id="L381" class="LineNr">381 </span>== <span class="Constant">0x1</span>
-<span id="L382" class="LineNr">382 </span><span class="Comment"># just avoid null pointer</span>
-<span id="L383" class="LineNr">383 </span>8b/copy <span class="Constant">1</span>/mod/lookup+disp8 <span class="Constant">0</span>/rm32/EAX <span class="Constant">2</span>/r32/EDX <span class="Constant">4</span>/disp8  <span class="Comment"># copy *(EAX+4) to EDX</span>
-<span id="L384" class="LineNr">384 </span>$error: <span class="Constant">0</span>
-<span id="L385" class="LineNr">385 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L386" class="LineNr">386 </span>
-<span id="L387" class="LineNr">387 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
-<span id="L388" class="LineNr">388 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L389" class="LineNr">389 </span>== <span class="Constant">0x1</span>
-<span id="L390" class="LineNr">390 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/mod
-<span id="L391" class="LineNr">391 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
-<span id="L392" class="LineNr">392 </span>
-<span id="L393" class="LineNr">393 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
-<span id="L394" class="LineNr">394 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L395" class="LineNr">395 </span>== <span class="Constant">0x1</span>
-<span id="L396" class="LineNr">396 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/r32
-<span id="L397" class="LineNr">397 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
-<span id="L398" class="LineNr">398 </span>
-<span id="L399" class="LineNr">399 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
-<span id="L400" class="LineNr">400 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L401" class="LineNr">401 </span>== <span class="Constant">0x1</span>
-<span id="L402" class="LineNr">402 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod            <span class="Constant">1</span>/imm32
-<span id="L403" class="LineNr">403 </span><span class="traceContains">+error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with <a href='011run.cc.html#L292'>imm32</a> based on subop): missing rm32 operand</span>
-<span id="L404" class="LineNr">404 </span>
-<span id="L405" class="LineNr">405 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
-<span id="L406" class="LineNr">406 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L407" class="LineNr">407 </span>== <span class="Constant">0x1</span>
-<span id="L408" class="LineNr">408 </span><span class="Constant">81</span>             <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
-<span id="L409" class="LineNr">409 </span><span class="traceContains">+error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with <a href='011run.cc.html#L292'>imm32</a> based on subop): missing <a href='036recommend_labels.cc.html#L54'>subop</a> operand</span>
-<span id="L410" class="LineNr">410 </span>
-<span id="L411" class="LineNr">411 </span><span class="Delimiter">:(scenario check_missing_base_operand)</span>
-<span id="L412" class="LineNr">412 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L413" class="LineNr">413 </span>== <span class="Constant">0x1</span>
-<span id="L414" class="LineNr">414 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
-<span id="L415" class="LineNr">415 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with <a href='011run.cc.html#L292'>imm32</a> based on subop): missing base operand</span>
-<span id="L416" class="LineNr">416 </span>
-<span id="L417" class="LineNr">417 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
-<span id="L418" class="LineNr">418 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L419" class="LineNr">419 </span>== <span class="Constant">0x1</span>
-<span id="L420" class="LineNr">420 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">0</span>/base <span class="Constant">1</span>/imm32
-<span id="L421" class="LineNr">421 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32' (combine rm32 with <a href='011run.cc.html#L292'>imm32</a> based on subop): missing index operand</span>
-<span id="L422" class="LineNr">422 </span>
-<span id="L423" class="LineNr">423 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</span>
-<span id="L424" class="LineNr">424 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L425" class="LineNr">425 </span>== <span class="Constant">0x1</span>
-<span id="L426" class="LineNr">426 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">2</span>/index <span class="Constant">3</span>/scale <span class="Constant">1</span>/imm32
-<span id="L427" class="LineNr">427 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32' (combine rm32 with <a href='011run.cc.html#L292'>imm32</a> based on subop): missing base operand</span>
-<span id="L428" class="LineNr">428 </span>
-<span id="L429" class="LineNr">429 </span><span class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
-<span id="L430" class="LineNr">430 </span>== <span class="Constant">0x1</span>
-<span id="L431" class="LineNr">431 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">3</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
-<span id="L432" class="LineNr">432 </span>$error: <span class="Constant">0</span>
-<span id="L433" class="LineNr">433 </span>
-<span id="L434" class="LineNr">434 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
+<span id="L239" class="LineNr">239 </span><span class="Comment">//: Many instructions can be checked just by comparing bitvectors.</span>
+<span id="L240" class="LineNr">240 </span>
+<span id="L241" class="LineNr">241 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L241'>compare_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L242" class="LineNr">242 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L274'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
+<span id="L243" class="LineNr">243 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L265'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L244" class="LineNr">244 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L245" class="LineNr">245 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
+<span id="L246" class="LineNr">246 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L247" class="LineNr">247 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
+<span id="L248" class="LineNr">248 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
+<span id="L249" class="LineNr">249 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L250" class="LineNr">250 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
+<span id="L251" class="LineNr">251 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L259'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L252" class="LineNr">252 </span>    <span class="Normal">else</span>
+<span id="L253" class="LineNr">253 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L259'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L254" class="LineNr">254 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L255" class="LineNr">255 </span>  <span class="Delimiter">}</span>
+<span id="L256" class="LineNr">256 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L257" class="LineNr">257 </span><span class="Delimiter">}</span>
+<span id="L258" class="LineNr">258 </span>
+<span id="L259" class="LineNr">259 </span>string <a href='031check_operands.cc.html#L259'>maybe_name</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L260" class="LineNr">260 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L261" class="LineNr">261 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L262" class="LineNr">262 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">)</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
+<span id="L263" class="LineNr">263 </span><span class="Delimiter">}</span>
+<span id="L264" class="LineNr">264 </span>
+<span id="L265" class="LineNr">265 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L265'>compute_operand_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L266" class="LineNr">266 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L267" class="LineNr">267 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L268" class="LineNr">268 </span>    bitvector = bitvector | <a href='031check_operands.cc.html#L291'>bitvector_for_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L269" class="LineNr">269 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L93'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Delimiter">}</span>
+<span id="L271" class="LineNr">271 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
+<span id="L272" class="LineNr">272 </span><span class="Delimiter">}</span>
+<span id="L273" class="LineNr">273 </span>
+<span id="L274" class="LineNr">274 </span><span class="Normal">bool</span> <a href='031check_operands.cc.html#L274'>has_operands</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L275" class="LineNr">275 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">)</span> &gt; <a href='031check_operands.cc.html#L278'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L276" class="LineNr">276 </span><span class="Delimiter">}</span>
+<span id="L277" class="LineNr">277 </span>
+<span id="L278" class="LineNr">278 </span><span class="Normal">int</span> <a href='031check_operands.cc.html#L278'>first_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L280" class="LineNr">280 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;f2&quot;</span> || inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L281" class="LineNr">281 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
+<span id="L282" class="LineNr">282 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
+<span id="L283" class="LineNr">283 </span>    <span class="Normal">else</span>
+<span id="L284" class="LineNr">284 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L285" class="LineNr">285 </span>  <span class="Delimiter">}</span>
+<span id="L286" class="LineNr">286 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L287" class="LineNr">287 </span><span class="Delimiter">}</span>
+<span id="L288" class="LineNr">288 </span>
+<span id="L289" class="LineNr">289 </span><span class="Comment">// Scan the metadata of 'w' and return the bit corresponding to any operand type.</span>
+<span id="L290" class="LineNr">290 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
+<span id="L291" class="LineNr">291 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L291'>bitvector_for_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L292" class="LineNr">292 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L293" class="LineNr">293 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L295" class="LineNr">295 </span>    <span class="Normal">const</span> string&amp; curr = w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L296" class="LineNr">296 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='031check_operands.cc.html#L73'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
+<span id="L297" class="LineNr">297 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L298" class="LineNr">298 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L299" class="LineNr">299 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L93'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
+<span id="L300" class="LineNr">300 </span>    <span class="Delimiter">}</span>
+<span id="L301" class="LineNr">301 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L73'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">));</span>
+<span id="L302" class="LineNr">302 </span>    found =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L303" class="LineNr">303 </span>  <span class="Delimiter">}</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Identifier">return</span> bv<span class="Delimiter">;</span>
+<span id="L305" class="LineNr">305 </span><span class="Delimiter">}</span>
+<span id="L306" class="LineNr">306 </span>
+<span id="L307" class="LineNr">307 </span><span class="Delimiter">:(scenario conflicting_operand_type)</span>
+<span id="L308" class="LineNr">308 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L309" class="LineNr">309 </span>== <span class="Constant">0x1</span>
+<span id="L310" class="LineNr">310 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
+<span id="L311" class="LineNr">311 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
+<span id="L312" class="LineNr">312 </span>
+<span id="L313" class="LineNr">313 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
+<span id="L314" class="LineNr">314 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
+<span id="L315" class="LineNr">315 </span>
+<span id="L316" class="LineNr">316 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
+<span id="L317" class="LineNr">317 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L318" class="LineNr">318 </span>== <span class="Constant">0x1</span>
+<span id="L319" class="LineNr">319 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop       <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
+<span id="L320" class="LineNr">320 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with <a href='011run.cc.html#L299'>imm32</a> based on subop): missing mod operand</span>
+<span id="L321" class="LineNr">321 </span>
+<span id="L322" class="LineNr">322 </span><span class="Delimiter">:(code)</span>
+<span id="L323" class="LineNr">323 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L323'>check_operands_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L324" class="LineNr">324 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
+<span id="L325" class="LineNr">325 </span>  <a href='031check_operands.cc.html#L370'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L326" class="LineNr">326 </span>  <a href='031check_operands.cc.html#L370'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L327" class="LineNr">327 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
+<span id="L328" class="LineNr">328 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;81&quot;</span> || op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;8f&quot;</span> || op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// keep sync'd with 'help subop'</span>
+<span id="L329" class="LineNr">329 </span>    <a href='031check_operands.cc.html#L370'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L330" class="LineNr">330 </span>    <a href='031check_operands.cc.html#L375'>check_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;should be replaced by subop&quot;</span><span class="Delimiter">);</span>
+<span id="L331" class="LineNr">331 </span>  <span class="Delimiter">}</span>
+<span id="L332" class="LineNr">332 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L333" class="LineNr">333 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> != <span class="Constant">&quot;4&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L334" class="LineNr">334 </span>  <span class="Comment">// SIB byte checks</span>
+<span id="L335" class="LineNr">335 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L229'>hex_byte</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
+<span id="L336" class="LineNr">336 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Comment">/*</span><span class="Comment">direct</span><span class="Comment">*/</span><span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L337" class="LineNr">337 </span>    <a href='031check_operands.cc.html#L370'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L338" class="LineNr">338 </span>    <a href='031check_operands.cc.html#L370'>check_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>  <span class="Comment">// otherwise why go to SIB?</span>
+<span id="L339" class="LineNr">339 </span>  <span class="Delimiter">}</span>
+<span id="L340" class="LineNr">340 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L341" class="LineNr">341 </span>    <a href='031check_operands.cc.html#L375'>check_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
+<span id="L342" class="LineNr">342 </span>    <a href='031check_operands.cc.html#L375'>check_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
+<span id="L343" class="LineNr">343 </span>  <span class="Delimiter">}</span>
+<span id="L344" class="LineNr">344 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span>
+<span id="L345" class="LineNr">345 </span><span class="Delimiter">}</span>
+<span id="L346" class="LineNr">346 </span>
+<span id="L347" class="LineNr">347 </span><span class="Comment">// same as compare_bitvector, with a couple of exceptions for modrm-based instructions</span>
+<span id="L348" class="LineNr">348 </span><span class="Comment">//   exception 1: ignore modrm bit since we already checked it above</span>
+<span id="L349" class="LineNr">349 </span><span class="Comment">//   exception 2: modrm instructions can use a displacement on occasion</span>
+<span id="L350" class="LineNr">350 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L350'>compare_bitvector_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L351" class="LineNr">351 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L274'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
+<span id="L352" class="LineNr">352 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L265'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L353" class="LineNr">353 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L354" class="LineNr">354 </span>  expected = CLEAR<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">);</span>  <span class="Comment">// exception 1</span>
+<span id="L355" class="LineNr">355 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
+<span id="L356" class="LineNr">356 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L357" class="LineNr">357 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing for modrm &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
+<span id="L358" class="LineNr">358 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
+<span id="L359" class="LineNr">359 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L64'>DISP8</a> || i == <a href='031check_operands.cc.html#L66'>DISP32</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
+<span id="L360" class="LineNr">360 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L361" class="LineNr">361 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
+<span id="L362" class="LineNr">362 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L259'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L363" class="LineNr">363 </span>    <span class="Normal">else</span>
+<span id="L364" class="LineNr">364 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L259'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L365" class="LineNr">365 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L366" class="LineNr">366 </span>  <span class="Delimiter">}</span>
+<span id="L367" class="LineNr">367 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L368" class="LineNr">368 </span><span class="Delimiter">}</span>
+<span id="L369" class="LineNr">369 </span>
+<span id="L370" class="LineNr">370 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L370'>check_metadata_present</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L371" class="LineNr">371 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
+<span id="L372" class="LineNr">372 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): missing &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L373" class="LineNr">373 </span><span class="Delimiter">}</span>
+<span id="L374" class="LineNr">374 </span>
+<span id="L375" class="LineNr">375 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L375'>check_metadata_absent</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; msg<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L376" class="LineNr">376 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
+<span id="L377" class="LineNr">377 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): unexpected &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand (&quot;</span> &lt;&lt; msg &lt;&lt; <span class="Constant">&quot;)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L378" class="LineNr">378 </span><span class="Delimiter">}</span>
+<span id="L379" class="LineNr">379 </span>
+<span id="L380" class="LineNr">380 </span><span class="Delimiter">:(scenarios transform)</span>
+<span id="L381" class="LineNr">381 </span><span class="Delimiter">:(scenario modrm_with_displacement)</span>
+<span id="L382" class="LineNr">382 </span><span class="Special">% Reg[EAX].u = 0x1;</span>
+<span id="L383" class="LineNr">383 </span>== <span class="Constant">0x1</span>
+<span id="L384" class="LineNr">384 </span><span class="Comment"># just avoid null pointer</span>
+<span id="L385" class="LineNr">385 </span>8b/copy <span class="Constant">1</span>/mod/lookup+disp8 <span class="Constant">0</span>/rm32/EAX <span class="Constant">2</span>/r32/EDX <span class="Constant">4</span>/disp8  <span class="Comment"># copy *(EAX+4) to EDX</span>
+<span id="L386" class="LineNr">386 </span>$error: <span class="Constant">0</span>
+<span id="L387" class="LineNr">387 </span><span class="Delimiter">:(scenarios run)</span>
+<span id="L388" class="LineNr">388 </span>
+<span id="L389" class="LineNr">389 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
+<span id="L390" class="LineNr">390 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L391" class="LineNr">391 </span>== <span class="Constant">0x1</span>
+<span id="L392" class="LineNr">392 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/mod
+<span id="L393" class="LineNr">393 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
+<span id="L394" class="LineNr">394 </span>
+<span id="L395" class="LineNr">395 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
+<span id="L396" class="LineNr">396 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L397" class="LineNr">397 </span>== <span class="Constant">0x1</span>
+<span id="L398" class="LineNr">398 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/r32
+<span id="L399" class="LineNr">399 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
+<span id="L400" class="LineNr">400 </span>
+<span id="L401" class="LineNr">401 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
+<span id="L402" class="LineNr">402 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L403" class="LineNr">403 </span>== <span class="Constant">0x1</span>
+<span id="L404" class="LineNr">404 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod            <span class="Constant">1</span>/imm32
+<span id="L405" class="LineNr">405 </span><span class="traceContains">+error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with <a href='011run.cc.html#L299'>imm32</a> based on subop): missing rm32 operand</span>
+<span id="L406" class="LineNr">406 </span>
+<span id="L407" class="LineNr">407 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
+<span id="L408" class="LineNr">408 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L409" class="LineNr">409 </span>== <span class="Constant">0x1</span>
+<span id="L410" class="LineNr">410 </span><span class="Constant">81</span>             <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
+<span id="L411" class="LineNr">411 </span><span class="traceContains">+error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with <a href='011run.cc.html#L299'>imm32</a> based on subop): missing subop operand</span>
+<span id="L412" class="LineNr">412 </span>
+<span id="L413" class="LineNr">413 </span><span class="Delimiter">:(scenario check_missing_base_operand)</span>
+<span id="L414" class="LineNr">414 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L415" class="LineNr">415 </span>== <span class="Constant">0x1</span>
+<span id="L416" class="LineNr">416 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
+<span id="L417" class="LineNr">417 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with <a href='011run.cc.html#L299'>imm32</a> based on subop): missing base operand</span>
+<span id="L418" class="LineNr">418 </span>
+<span id="L419" class="LineNr">419 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
+<span id="L420" class="LineNr">420 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L421" class="LineNr">421 </span>== <span class="Constant">0x1</span>
+<span id="L422" class="LineNr">422 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">0</span>/base <span class="Constant">1</span>/imm32
+<span id="L423" class="LineNr">423 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32' (combine rm32 with <a href='011run.cc.html#L299'>imm32</a> based on subop): missing index operand</span>
+<span id="L424" class="LineNr">424 </span>
+<span id="L425" class="LineNr">425 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</span>
+<span id="L426" class="LineNr">426 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L427" class="LineNr">427 </span>== <span class="Constant">0x1</span>
+<span id="L428" class="LineNr">428 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">2</span>/index <span class="Constant">3</span>/scale <span class="Constant">1</span>/imm32
+<span id="L429" class="LineNr">429 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32' (combine rm32 with <a href='011run.cc.html#L299'>imm32</a> based on subop): missing base operand</span>
+<span id="L430" class="LineNr">430 </span>
+<span id="L431" class="LineNr">431 </span><span class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
+<span id="L432" class="LineNr">432 </span>== <span class="Constant">0x1</span>
+<span id="L433" class="LineNr">433 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">3</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
+<span id="L434" class="LineNr">434 </span>$error: <span class="Constant">0</span>
 <span id="L435" class="LineNr">435 </span>
-<span id="L436" class="LineNr">436 </span><span class="Delimiter">:(code)</span>
-<span id="L437" class="LineNr">437 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L483'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L438" class="LineNr">438 </span>  assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
-<span id="L439" class="LineNr">439 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L440" class="LineNr">440 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L441" class="LineNr">441 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L442" class="LineNr">442 </span>  <span class="Delimiter">}</span>
-<span id="L443" class="LineNr">443 </span>  <a href='011run.cc.html#L116'>word</a> op = <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
-<span id="L444" class="LineNr">444 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L445" class="LineNr">445 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown 2-byte opcode '0f &quot;</span> &lt;&lt; op<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L446" class="LineNr">446 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L447" class="LineNr">447 </span>  <span class="Delimiter">}</span>
-<span id="L448" class="LineNr">448 </span>  <a href='031check_operands.cc.html#L483'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L449" class="LineNr">449 </span><span class="Delimiter">}</span>
-<span id="L450" class="LineNr">450 </span>
-<span id="L451" class="LineNr">451 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L451'>check_operands_f3</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L452" class="LineNr">452 </span>  <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L453" class="LineNr">453 </span><span class="Delimiter">}</span>
-<span id="L454" class="LineNr">454 </span>
-<span id="L455" class="LineNr">455 </span><span class="Delimiter">:(scenario check_missing_disp16_operand)</span>
-<span id="L456" class="LineNr">456 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L457" class="LineNr">457 </span>== <span class="Constant">0x1</span>
-<span id="L458" class="LineNr">458 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L459" class="LineNr">459 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L460" class="LineNr">460 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L461" class="LineNr">461 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                             <span class="Comment"># jmp if ZF to ??</span>
-<span id="L462" class="LineNr">462 </span><span class="traceContains">+error: '0f 84' (jump disp16 bytes away if ZF is set): missing disp16 operand</span>
-<span id="L463" class="LineNr">463 </span>
-<span id="L464" class="LineNr">464 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L465" class="LineNr">465 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <a href='031check_operands.cc.html#L465'>Permitted_operands_0f</a><span class="Delimiter">;</span>
-<span id="L466" class="LineNr">466 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
-<span id="L467" class="LineNr">467 </span><span class="SalientComment">//// Class C: just op and disp16</span>
-<span id="L468" class="LineNr">468 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L469" class="LineNr">469 </span><span class="Comment">//  0     0     0      |1       0     0     0</span>
-<span id="L470" class="LineNr">470 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L465'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L471" class="LineNr">471 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L465'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L472" class="LineNr">472 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L465'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L473" class="LineNr">473 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L465'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L474" class="LineNr">474 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L465'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L475" class="LineNr">475 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L465'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L476" class="LineNr">476 </span>
-<span id="L477" class="LineNr">477 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
-<span id="L478" class="LineNr">478 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L479" class="LineNr">479 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
-<span id="L480" class="LineNr">480 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L465'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L481" class="LineNr">481 </span>
-<span id="L482" class="LineNr">482 </span><span class="Delimiter">:(code)</span>
-<span id="L483" class="LineNr">483 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L483'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L484" class="LineNr">484 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L465'>Permitted_operands_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">);</span>
-<span id="L485" class="LineNr">485 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">))</span>
-<span id="L486" class="LineNr">486 </span>    <a href='031check_operands.cc.html#L321'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L487" class="LineNr">487 </span>  <a href='031check_operands.cc.html#L490'>compare_bitvector_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> CLEAR<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
-<span id="L488" class="LineNr">488 </span><span class="Delimiter">}</span>
-<span id="L489" class="LineNr">489 </span>
-<span id="L490" class="LineNr">490 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L490'>compare_bitvector_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L491" class="LineNr">491 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L272'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L492" class="LineNr">492 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L263'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L493" class="LineNr">493 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L494" class="LineNr">494 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
-<span id="L495" class="LineNr">495 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L496" class="LineNr">496 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
-<span id="L497" class="LineNr">497 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
-<span id="L498" class="LineNr">498 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L499" class="LineNr">499 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
-<span id="L500" class="LineNr">500 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L501" class="LineNr">501 </span>    <span class="Normal">else</span>
-<span id="L502" class="LineNr">502 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L503" class="LineNr">503 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L504" class="LineNr">504 </span>  <span class="Delimiter">}</span>
-<span id="L505" class="LineNr">505 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L506" class="LineNr">506 </span><span class="Delimiter">}</span>
-<span id="L507" class="LineNr">507 </span>
-<span id="L508" class="LineNr">508 </span>string <a href='031check_operands.cc.html#L508'>tolower</a><span class="Delimiter">(</span><span class="Normal">const</span> <span class="Normal">char</span>* s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L509" class="LineNr">509 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L510" class="LineNr">510 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  *s<span class="Delimiter">;</span>  ++s<span class="Delimiter">)</span>
-<span id="L511" class="LineNr">511 </span>    out &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">char</span>&gt;<span class="Delimiter">(</span><a href='031check_operands.cc.html#L508'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
-<span id="L512" class="LineNr">512 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L513" class="LineNr">513 </span><span class="Delimiter">}</span>
-<span id="L514" class="LineNr">514 </span>
-<span id="L515" class="LineNr">515 </span><span class="Comment">#undef HAS</span>
-<span id="L516" class="LineNr">516 </span><span class="Comment">#undef SET</span>
-<span id="L517" class="LineNr">517 </span><span class="Comment">#undef CLEAR</span>
-<span id="L518" class="LineNr">518 </span>
-<span id="L519" class="LineNr">519 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L520" class="LineNr">520 </span><span class="Comment">#include&lt;cctype&gt;</span>
+<span id="L436" class="LineNr">436 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
+<span id="L437" class="LineNr">437 </span>
+<span id="L438" class="LineNr">438 </span><span class="Delimiter">:(code)</span>
+<span id="L439" class="LineNr">439 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L485'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L440" class="LineNr">440 </span>  assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
+<span id="L441" class="LineNr">441 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L442" class="LineNr">442 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L443" class="LineNr">443 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L444" class="LineNr">444 </span>  <span class="Delimiter">}</span>
+<span id="L445" class="LineNr">445 </span>  <a href='011run.cc.html#L120'>word</a> op = <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
+<span id="L446" class="LineNr">446 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L447" class="LineNr">447 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown 2-byte opcode '0f &quot;</span> &lt;&lt; op<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L448" class="LineNr">448 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L449" class="LineNr">449 </span>  <span class="Delimiter">}</span>
+<span id="L450" class="LineNr">450 </span>  <a href='031check_operands.cc.html#L485'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L451" class="LineNr">451 </span><span class="Delimiter">}</span>
+<span id="L452" class="LineNr">452 </span>
+<span id="L453" class="LineNr">453 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L453'>check_operands_f3</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L454" class="LineNr">454 </span>  <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L455" class="LineNr">455 </span><span class="Delimiter">}</span>
+<span id="L456" class="LineNr">456 </span>
+<span id="L457" class="LineNr">457 </span><span class="Delimiter">:(scenario check_missing_disp16_operand)</span>
+<span id="L458" class="LineNr">458 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L459" class="LineNr">459 </span>== <span class="Constant">0x1</span>
+<span id="L460" class="LineNr">460 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L461" class="LineNr">461 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L462" class="LineNr">462 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L463" class="LineNr">463 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                             <span class="Comment"># jmp if ZF to ??</span>
+<span id="L464" class="LineNr">464 </span><span class="traceContains">+error: '0f 84' (jump disp16 bytes away if ZF is set): missing disp16 operand</span>
+<span id="L465" class="LineNr">465 </span>
+<span id="L466" class="LineNr">466 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L467" class="LineNr">467 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">;</span>
+<span id="L468" class="LineNr">468 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
+<span id="L469" class="LineNr">469 </span><span class="SalientComment">//// Class C: just op and disp16</span>
+<span id="L470" class="LineNr">470 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L471" class="LineNr">471 </span><span class="Comment">//  0     0     0      |1       0     0     0</span>
+<span id="L472" class="LineNr">472 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L473" class="LineNr">473 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L474" class="LineNr">474 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L475" class="LineNr">475 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L476" class="LineNr">476 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L477" class="LineNr">477 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L478" class="LineNr">478 </span>
+<span id="L479" class="LineNr">479 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
+<span id="L480" class="LineNr">480 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L481" class="LineNr">481 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
+<span id="L482" class="LineNr">482 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L483" class="LineNr">483 </span>
+<span id="L484" class="LineNr">484 </span><span class="Delimiter">:(code)</span>
+<span id="L485" class="LineNr">485 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L485'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L486" class="LineNr">486 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
+<span id="L487" class="LineNr">487 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">))</span>
+<span id="L488" class="LineNr">488 </span>    <a href='031check_operands.cc.html#L323'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L489" class="LineNr">489 </span>  <a href='031check_operands.cc.html#L492'>compare_bitvector_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> CLEAR<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
+<span id="L490" class="LineNr">490 </span><span class="Delimiter">}</span>
+<span id="L491" class="LineNr">491 </span>
+<span id="L492" class="LineNr">492 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L492'>compare_bitvector_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L493" class="LineNr">493 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L274'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
+<span id="L494" class="LineNr">494 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L265'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L495" class="LineNr">495 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L496" class="LineNr">496 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
+<span id="L497" class="LineNr">497 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L498" class="LineNr">498 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
+<span id="L499" class="LineNr">499 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
+<span id="L500" class="LineNr">500 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L501" class="LineNr">501 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
+<span id="L502" class="LineNr">502 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L503" class="LineNr">503 </span>    <span class="Normal">else</span>
+<span id="L504" class="LineNr">504 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L505" class="LineNr">505 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L506" class="LineNr">506 </span>  <span class="Delimiter">}</span>
+<span id="L507" class="LineNr">507 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L508" class="LineNr">508 </span><span class="Delimiter">}</span>
+<span id="L509" class="LineNr">509 </span>
+<span id="L510" class="LineNr">510 </span>string <a href='031check_operands.cc.html#L510'>tolower</a><span class="Delimiter">(</span><span class="Normal">const</span> <span class="Normal">char</span>* s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L511" class="LineNr">511 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L512" class="LineNr">512 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  *s<span class="Delimiter">;</span>  ++s<span class="Delimiter">)</span>
+<span id="L513" class="LineNr">513 </span>    out &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">char</span>&gt;<span class="Delimiter">(</span><a href='031check_operands.cc.html#L510'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
+<span id="L514" class="LineNr">514 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L515" class="LineNr">515 </span><span class="Delimiter">}</span>
+<span id="L516" class="LineNr">516 </span>
+<span id="L517" class="LineNr">517 </span><span class="Comment">#undef HAS</span>
+<span id="L518" class="LineNr">518 </span><span class="Comment">#undef SET</span>
+<span id="L519" class="LineNr">519 </span><span class="Comment">#undef CLEAR</span>
+<span id="L520" class="LineNr">520 </span>
+<span id="L521" class="LineNr">521 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L522" class="LineNr">522 </span><span class="Comment">#include&lt;cctype&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/032check_operand_bounds.cc.html b/html/subx/032check_operand_bounds.cc.html
index cc7ea319..52765a46 100644
--- a/html/subx/032check_operand_bounds.cc.html
+++ b/html/subx/032check_operand_bounds.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/032check_operand_bounds.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .cSpecial { color: #008000; }
-.SalientComment { color: #00ffff; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.PreProc { color: #800080; }
-.traceContains { color: #008000; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.PreProc { color: #800080; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -86,15 +86,15 @@ if ('onhashchange' in window) {
 <span id="L23" class="LineNr">23 </span><span class="Comment">// no bound needed for imm32</span>
 <span id="L24" class="LineNr">24 </span>
 <span id="L25" class="LineNr">25 </span><span class="Delimiter">:(before &quot;Pack Operands(segment code)&quot;)</span>
-<span id="L26" class="LineNr">26 </span>check_operand_bounds<span class="Delimiter">(</span>code<span class="Delimiter">);</span>
+<span id="L26" class="LineNr">26 </span>check_operand_bounds<span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">);</span>
 <span id="L27" class="LineNr">27 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L28" class="LineNr">28 </span><span class="Delimiter">:(code)</span>
-<span id="L29" class="LineNr">29 </span><span class="Normal">void</span> check_operand_bounds<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; code<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L29" class="LineNr">29 </span><span class="Normal">void</span> check_operand_bounds<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L30" class="LineNr">30 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check operand bounds&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L31" class="LineNr">31 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L32" class="LineNr">32 </span>    <span class="Normal">const</span> line&amp; inst = code<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L33" class="LineNr">33 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <a href='031check_operands.cc.html#L276'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
-<span id="L34" class="LineNr">34 </span>      check_operand_bounds<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span>
+<span id="L31" class="LineNr">31 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L32" class="LineNr">32 </span>    <span class="Normal">const</span> line&amp; inst = <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L33" class="LineNr">33 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <a href='031check_operands.cc.html#L278'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
+<span id="L34" class="LineNr">34 </span>      check_operand_bounds<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span>
 <span id="L35" class="LineNr">35 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// stop at the first mal-formed instruction</span>
 <span id="L36" class="LineNr">36 </span>  <span class="Delimiter">}</span>
 <span id="L37" class="LineNr">37 </span><span class="Delimiter">}</span>
@@ -102,8 +102,8 @@ if ('onhashchange' in window) {
 <span id="L39" class="LineNr">39 </span><span class="Normal">void</span> check_operand_bounds<span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L40" class="LineNr">40 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;::iterator p = <a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L41" class="LineNr">41 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_metadata<span class="Delimiter">(</span>w<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L42" class="LineNr">42 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_int<span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// later transforms are on their own to do their own bounds checking</span>
-<span id="L43" class="LineNr">43 </span>    <span class="Normal">int32_t</span> x = <a href='030---operands.cc.html#L432'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">);</span>
+<span id="L42" class="LineNr">42 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_int<span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// later transforms are on their own to do their own bounds checking</span>
+<span id="L43" class="LineNr">43 </span>    <span class="Normal">int32_t</span> x = <a href='011run.cc.html#L308'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
 <span id="L44" class="LineNr">44 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>x &gt;= <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L45" class="LineNr">45 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span>x<span class="Delimiter">)</span> &gt;= p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">)</span>
 <span id="L46" class="LineNr">46 </span>        <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' too large to fit in bitfield &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
diff --git a/html/subx/034compute_segment_address.cc.html b/html/subx/034compute_segment_address.cc.html
new file mode 100644
index 00000000..92f2f152
--- /dev/null
+++ b/html/subx/034compute_segment_address.cc.html
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/034compute_segment_address.cc</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="cpp">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<style type="text/css">
+<!--
+pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+a { color:#eeeeee; text-decoration: none; }
+a:hover { text-decoration: underline; }
+* { font-size: 12pt; font-size: 1em; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.PreProc { color: #800080; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="Comment">//: Start allowing us to not specify precise addresses for the start of each</span>
+<span id="L2" class="LineNr"> 2 </span><span class="Comment">//: segment.</span>
+<span id="L3" class="LineNr"> 3 </span><span class="Comment">//: This gives up a measure of control in placing code and data.</span>
+<span id="L4" class="LineNr"> 4 </span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment">//: segment address computation requires setting Mem_offset in test mode to what it'll be in run mode</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Delimiter">:(scenario segment_name)</span>
+<span id="L7" class="LineNr"> 7 </span><span class="Special">% Mem_offset = CODE_START;</span>
+<span id="L8" class="LineNr"> 8 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L9" class="LineNr"> 9 </span><span class="PreProc">0</span><span class="Constant">5</span>/add <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add 0x0d0c0b0a to EAX</span>
+<span id="L10" class="LineNr">10 </span><span class="Comment"># code starts at 0x08048000 + p_offset, which is 0x54 for a single-segment binary</span>
+<span id="L11" class="LineNr">11 </span><span class="traceContains">+load: 0x08048054 -&gt; 05</span>
+<span id="L12" class="LineNr">12 </span><span class="traceContains">+load: 0x08048055 -&gt; 0a</span>
+<span id="L13" class="LineNr">13 </span><span class="traceContains">+load: 0x08048056 -&gt; 0b</span>
+<span id="L14" class="LineNr">14 </span><span class="traceContains">+load: 0x08048057 -&gt; 0c</span>
+<span id="L15" class="LineNr">15 </span><span class="traceContains">+load: 0x08048058 -&gt; 0d</span>
+<span id="L16" class="LineNr">16 </span><span class="traceContains">+run: add <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a to <a href='010---vm.cc.html#L23'>reg</a> <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L17" class="LineNr">17 </span><span class="traceContains">+run: storing 0x0d0c0b0a</span>
+<span id="L18" class="LineNr">18 </span>
+<span id="L19" class="LineNr">19 </span><span class="Delimiter">:(before &quot;End Level-2 Transforms&quot;)</span>
+<span id="L20" class="LineNr">20 </span><a href='011run.cc.html#L191'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L23'>compute_segment_starts</a><span class="Delimiter">);</span>
+<span id="L21" class="LineNr">21 </span>
+<span id="L22" class="LineNr">22 </span><span class="Delimiter">:(code)</span>
+<span id="L23" class="LineNr">23 </span><span class="Normal">void</span> <a href='034compute_segment_address.cc.html#L23'>compute_segment_starts</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L24" class="LineNr">24 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- compute segment addresses&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L25" class="LineNr">25 </span>  <span class="Normal">uint32_t</span> p_offset = <span class="Comment">/*</span><span class="Comment">size of ehdr</span><span class="Comment">*/</span><span class="Constant">0x34</span> + <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">)</span>*<span class="Constant">0x20</span><span class="Comment">/*</span><span class="Comment">size of each phdr</span><span class="Comment">*/</span><span class="Delimiter">;</span>
+<span id="L26" class="LineNr">26 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>size<span class="Delimiter">();</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L27" class="LineNr">27 </span>    segment&amp; curr = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L28" class="LineNr">28 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L29" class="LineNr">29 </span>      curr<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a> = <a href='012elf.cc.html#L126'>CODE_START</a> + i*SEGMENT_SIZE + p_offset<span class="Delimiter">;</span>
+<span id="L30" class="LineNr">30 </span>      <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;segment &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; begins at address &quot;</span> &lt;&lt; curr<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L31" class="LineNr">31 </span>    <span class="Delimiter">}</span>
+<span id="L32" class="LineNr">32 </span>    p_offset += <a href='034compute_segment_address.cc.html#L37'>size_of</a><span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L33" class="LineNr">33 </span>    assert<span class="Delimiter">(</span>p_offset &lt; <a href='012elf.cc.html#L127'>SEGMENT_SIZE</a><span class="Delimiter">);</span>  <span class="Comment">// for now we get less and less available space in each successive segment</span>
+<span id="L34" class="LineNr">34 </span>  <span class="Delimiter">}</span>
+<span id="L35" class="LineNr">35 </span><span class="Delimiter">}</span>
+<span id="L36" class="LineNr">36 </span>
+<span id="L37" class="LineNr">37 </span><span class="Normal">uint32_t</span> <a href='034compute_segment_address.cc.html#L37'>size_of</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L38" class="LineNr">38 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L39" class="LineNr">39 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L40" class="LineNr">40 </span>    sum += <a href='034compute_segment_address.cc.html#L45'>num_bytes</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L41" class="LineNr">41 </span>  <span class="Identifier">return</span> sum<span class="Delimiter">;</span>
+<span id="L42" class="LineNr">42 </span><span class="Delimiter">}</span>
+<span id="L43" class="LineNr">43 </span>
+<span id="L44" class="LineNr">44 </span><span class="Comment">// Assumes all bitfields are packed.</span>
+<span id="L45" class="LineNr">45 </span><span class="Normal">uint32_t</span> <a href='034compute_segment_address.cc.html#L45'>num_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L46" class="LineNr">46 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L47" class="LineNr">47 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L48" class="LineNr">48 </span>    <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L49" class="LineNr">49 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span> || has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span>  <span class="Comment">// only multi-byte operands</span>
+<span id="L50" class="LineNr">50 </span>      sum += <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L51" class="LineNr">51 </span>    <span class="Normal">else</span>
+<span id="L52" class="LineNr">52 </span>      sum++<span class="Delimiter">;</span>
+<span id="L53" class="LineNr">53 </span>  <span class="Delimiter">}</span>
+<span id="L54" class="LineNr">54 </span>  <span class="Identifier">return</span> sum<span class="Delimiter">;</span>
+<span id="L55" class="LineNr">55 </span><span class="Delimiter">}</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/035labels.cc.html b/html/subx/035labels.cc.html
index a3c9f4ca..7cf4d088 100644
--- a/html/subx/035labels.cc.html
+++ b/html/subx/035labels.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/035labels.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.traceContains { color: #008000; }
+.PreProc { color: #800080; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.traceContains { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -61,7 +61,7 @@ if ('onhashchange' in window) {
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr">  1 </span><span class="Comment">//: Labels are defined by ending names with a ':'. This layer will compute</span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment">//: addresses for labels, and compute the offset for instructions using them.</span>
+<span id="L2" class="LineNr">  2 </span><span class="Comment">//: displacements for labels, and compute the offset for instructions using them.</span>
 <span id="L3" class="LineNr">  3 </span><span class="Comment">//:</span>
 <span id="L4" class="LineNr">  4 </span><span class="Comment">//: We won't check this, but our convention will be that jump targets will</span>
 <span id="L5" class="LineNr">  5 </span><span class="Comment">//: start with a '$', while functions will not. Function names will never be</span>
@@ -80,228 +80,204 @@ if ('onhashchange' in window) {
 <span id="L18" class="LineNr"> 18 </span><span class="Comment">//: be a single character long. 'a' is not a hex number, it's a variable.</span>
 <span id="L19" class="LineNr"> 19 </span><span class="Comment">//: Later layers may add more conventions partitioning the space of names. But</span>
 <span id="L20" class="LineNr"> 20 </span><span class="Comment">//: the above rules will remain inviolate.</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Normal">bool</span> <a href='035labels.cc.html#L21'>is_number</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> == <span class="Constant">'-'</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L23" class="LineNr"> 23 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>isdigit<span class="Delimiter">(</span>s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">)</span> == <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L25" class="LineNr"> 25 </span><span class="Delimiter">}</span>
-<span id="L26" class="LineNr"> 26 </span><span class="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
-<span id="L27" class="LineNr"> 27 </span><span class="Normal">void</span> <a href='035labels.cc.html#L27'>test_is_number</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L28" class="LineNr"> 28 </span>  <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!is_number<span class="Delimiter">(</span><span class="Constant">&quot;a&quot;</span><span class="Delimiter">));</span>
-<span id="L29" class="LineNr"> 29 </span><span class="Delimiter">}</span>
-<span id="L30" class="LineNr"> 30 </span><span class="Delimiter">:(code)</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Normal">void</span> <a href='035labels.cc.html#L31'>check_valid_name</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L33" class="LineNr"> 33 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;empty name!</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L34" class="LineNr"> 34 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L35" class="LineNr"> 35 </span>  <span class="Delimiter">}</span>
-<span id="L36" class="LineNr"> 36 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> == <span class="Constant">'-'</span><span class="Delimiter">)</span>
-<span id="L37" class="LineNr"> 37 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' starts with '-', which can be confused with a negative number; use a different <a href='010---vm.cc.html#L228'>name</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L38" class="LineNr"> 38 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">)</span> == <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' looks like a hex number; use a different <a href='010---vm.cc.html#L228'>name</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L40" class="LineNr"> 40 </span>    <span class="Identifier">return</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="Normal">if</span> <span class="Delimiter">(</span>isdigit<span class="Delimiter">(</span>s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span>
-<span id="L43" class="LineNr"> 43 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' starts with a digit, and so can be confused with a negative number; use a different name.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">)</span> == <span class="Constant">2</span><span class="Delimiter">)</span>
-<span id="L45" class="LineNr"> 45 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is two characters long which can look like raw hex bytes at a glance; use a different <a href='010---vm.cc.html#L228'>name</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L46" class="LineNr"> 46 </span><span class="Delimiter">}</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Normal">void</span> <a href='035labels.cc.html#L21'>check_valid_name</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L22" class="LineNr"> 22 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L23" class="LineNr"> 23 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;empty name!</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L24" class="LineNr"> 24 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L25" class="LineNr"> 25 </span>  <span class="Delimiter">}</span>
+<span id="L26" class="LineNr"> 26 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> == <span class="Constant">'-'</span><span class="Delimiter">)</span>
+<span id="L27" class="LineNr"> 27 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' starts with '-', which can be confused with a negative number; use a different <a href='010---vm.cc.html#L228'>name</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">)</span> == <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L29" class="LineNr"> 29 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' looks like a hex number; use a different <a href='010---vm.cc.html#L228'>name</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L30" class="LineNr"> 30 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L31" class="LineNr"> 31 </span>  <span class="Delimiter">}</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>isdigit<span class="Delimiter">(</span>s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span>
+<span id="L33" class="LineNr"> 33 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' starts with a digit, and so can be confused with a negative number; use a different name.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L34" class="LineNr"> 34 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">)</span> == <span class="Constant">2</span><span class="Delimiter">)</span>
+<span id="L35" class="LineNr"> 35 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is two characters long which can look like raw hex bytes at a glance; use a different <a href='010---vm.cc.html#L228'>name</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L36" class="LineNr"> 36 </span><span class="Delimiter">}</span>
+<span id="L37" class="LineNr"> 37 </span>
+<span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(scenarios transform)</span>
+<span id="L39" class="LineNr"> 39 </span><span class="Delimiter">:(scenario map_label)</span>
+<span id="L40" class="LineNr"> 40 </span>== <span class="Constant">0x1</span>
+<span id="L41" class="LineNr"> 41 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L42" class="LineNr"> 42 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L43" class="LineNr"> 43 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L44" class="LineNr"> 44 </span><span class="Normal">loop</span>:
+<span id="L45" class="LineNr"> 45 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
+<span id="L46" class="LineNr"> 46 </span><span class="traceContains">+transform: <a href='003trace.cc.html#L73'>label</a> 'loop' is at address 1</span>
 <span id="L47" class="LineNr"> 47 </span>
-<span id="L48" class="LineNr"> 48 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L49" class="LineNr"> 49 </span><span class="Delimiter">:(scenario map_label)</span>
-<span id="L50" class="LineNr"> 50 </span>== <span class="Constant">0x1</span>
-<span id="L51" class="LineNr"> 51 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L52" class="LineNr"> 52 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L53" class="LineNr"> 53 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Normal">loop</span>:
-<span id="L55" class="LineNr"> 55 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
-<span id="L56" class="LineNr"> 56 </span><span class="traceContains">+transform: <a href='003trace.cc.html#L73'>label</a> 'loop' is at address 1</span>
-<span id="L57" class="LineNr"> 57 </span>
-<span id="L58" class="LineNr"> 58 </span><span class="Delimiter">:(before &quot;End Level-2 Transforms&quot;)</span>
-<span id="L59" class="LineNr"> 59 </span><a href='011run.cc.html#L184'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='035labels.cc.html#L61'>rewrite_labels</a><span class="Delimiter">);</span>
-<span id="L60" class="LineNr"> 60 </span><span class="Delimiter">:(code)</span>
-<span id="L61" class="LineNr"> 61 </span><span class="Normal">void</span> <a href='035labels.cc.html#L61'>rewrite_labels</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L62" class="LineNr"> 62 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- rewrite labels&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L63" class="LineNr"> 63 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L64" class="LineNr"> 64 </span>  segment&amp; <a href='031check_operands.cc.html#L14'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L65" class="LineNr"> 65 </span>  <span class="Comment">// Rewrite Labels(segment code)</span>
-<span id="L66" class="LineNr"> 66 </span>  map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt; address<span class="Delimiter">;</span>  <span class="Comment">// values are unsigned, but we're going to do subtractions on them so they need to fit in 31 bits</span>
-<span id="L67" class="LineNr"> 67 </span>  <a href='035labels.cc.html#L74'>compute_addresses_for_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">,</span> address<span class="Delimiter">);</span>
-<span id="L68" class="LineNr"> 68 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L69" class="LineNr"> 69 </span>  <a href='035labels.cc.html#L111'>drop_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">);</span>
-<span id="L70" class="LineNr"> 70 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L71" class="LineNr"> 71 </span>  <a href='035labels.cc.html#L123'>replace_labels_with_addresses</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">,</span> address<span class="Delimiter">);</span>
-<span id="L72" class="LineNr"> 72 </span><span class="Delimiter">}</span>
-<span id="L73" class="LineNr"> 73 </span>
-<span id="L74" class="LineNr"> 74 </span><span class="Normal">void</span> <a href='035labels.cc.html#L74'>compute_addresses_for_labels</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L75" class="LineNr"> 75 </span>  <span class="Normal">int</span> current_byte = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L76" class="LineNr"> 76 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L77" class="LineNr"> 77 </span>    <span class="Normal">const</span> line&amp; inst = <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L78" class="LineNr"> 78 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L79" class="LineNr"> 79 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L80" class="LineNr"> 80 </span>      <span class="Comment">// hack: if we have any operand metadata left after previous transforms,</span>
-<span id="L81" class="LineNr"> 81 </span>      <span class="Comment">// deduce its size</span>
-<span id="L82" class="LineNr"> 82 </span>      <span class="Comment">// Maybe we should just move this transform to before instruction</span>
-<span id="L83" class="LineNr"> 83 </span>      <span class="Comment">// packing, and deduce the size of *all* operands. But then we'll also</span>
-<span id="L84" class="LineNr"> 84 </span>      <span class="Comment">// have to deal with bitfields.</span>
-<span id="L85" class="LineNr"> 85 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span> || has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L86" class="LineNr"> 86 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">)</span>
-<span id="L87" class="LineNr"> 87 </span>          <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': don't use ':' when jumping to labels</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L88" class="LineNr"> 88 </span>        current_byte += <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L89" class="LineNr"> 89 </span>      <span class="Delimiter">}</span>
-<span id="L90" class="LineNr"> 90 </span>      <span class="Comment">// automatically handle /disp8 and /imm8 here</span>
-<span id="L91" class="LineNr"> 91 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L92" class="LineNr"> 92 </span>        ++current_byte<span class="Delimiter">;</span>
-<span id="L93" class="LineNr"> 93 </span>      <span class="Delimiter">}</span>
-<span id="L94" class="LineNr"> 94 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L95" class="LineNr"> 95 </span>        string <a href='003trace.cc.html#L73'>label</a> = <a href='035labels.cc.html#L180'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">);</span>
-<span id="L96" class="LineNr"> 96 </span>        <span class="Comment">// ensure labels look sufficiently different from raw hex</span>
-<span id="L97" class="LineNr"> 97 </span>        <a href='035labels.cc.html#L31'>check_valid_name</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>
-<span id="L98" class="LineNr"> 98 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L99" class="LineNr"> 99 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L381'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
-<span id="L100" class="LineNr">100 </span>          <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': <a href='003trace.cc.html#L73'>label</a> definition (':') not allowed in operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L101" class="LineNr">101 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
-<span id="L102" class="LineNr">102 </span>          <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': labels can only be the first <a href='011run.cc.html#L116'>word</a> in a line.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L103" class="LineNr">103 </span>        <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> current_byte<span class="Delimiter">);</span>
-<span id="L104" class="LineNr">104 </span>        <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' is at address &quot;</span> &lt;&lt; <span class="Delimiter">(</span>current_byte+code<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L105" class="LineNr">105 </span>        <span class="Comment">// no modifying current_byte; label definitions won't be in the final binary</span>
-<span id="L106" class="LineNr">106 </span>      <span class="Delimiter">}</span>
-<span id="L107" class="LineNr">107 </span>    <span class="Delimiter">}</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Delimiter">}</span>
-<span id="L109" class="LineNr">109 </span><span class="Delimiter">}</span>
-<span id="L110" class="LineNr">110 </span>
-<span id="L111" class="LineNr">111 </span><span class="Normal">void</span> <a href='035labels.cc.html#L111'>drop_labels</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L112" class="LineNr">112 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L113" class="LineNr">113 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L114" class="LineNr">114 </span>    vector&lt;word&gt;::iterator new_end = remove_if<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">(),</span> <a href='035labels.cc.html#L119'>is_label</a><span class="Delimiter">);</span>
-<span id="L115" class="LineNr">115 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>erase<span class="Delimiter">(</span>new_end<span class="Delimiter">,</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">());</span>
-<span id="L116" class="LineNr">116 </span>  <span class="Delimiter">}</span>
-<span id="L117" class="LineNr">117 </span><span class="Delimiter">}</span>
-<span id="L118" class="LineNr">118 </span>
-<span id="L119" class="LineNr">119 </span><span class="Normal">bool</span> <a href='035labels.cc.html#L119'>is_label</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L120" class="LineNr">120 </span>  <span class="Identifier">return</span> *w<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">;</span>
-<span id="L121" class="LineNr">121 </span><span class="Delimiter">}</span>
-<span id="L122" class="LineNr">122 </span>
-<span id="L123" class="LineNr">123 </span><span class="Normal">void</span> <a href='035labels.cc.html#L123'>replace_labels_with_addresses</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L124" class="LineNr">124 </span>  <span class="Normal">int32_t</span> byte_next_instruction_starts_at = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L125" class="LineNr">125 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L126" class="LineNr">126 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L127" class="LineNr">127 </span>    byte_next_instruction_starts_at += <a href='035labels.cc.html#L159'>num_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L128" class="LineNr">128 </span>    <a href='011run.cc.html#L110'>line</a> new_inst<span class="Delimiter">;</span>
-<span id="L129" class="LineNr">129 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L130" class="LineNr">130 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L131" class="LineNr">131 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L247'>contains_key</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L132" class="LineNr">132 </span>        <span class="Normal">int32_t</span> offset = <span class="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span>get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">))</span> - byte_next_instruction_starts_at<span class="Delimiter">;</span>
-<span id="L133" class="LineNr">133 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">)</span> || has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L134" class="LineNr">134 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>offset &gt; <span class="Constant">0xff</span> || offset &lt; -<span class="Constant">0x7f</span><span class="Delimiter">)</span>
-<span id="L135" class="LineNr">135 </span>            <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': <a href='003trace.cc.html#L73'>label</a> too far away for distance &quot;</span> &lt;&lt; std::hex &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; to fit in 8 bits</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L136" class="LineNr">136 </span>          <span class="Normal">else</span>
-<span id="L137" class="LineNr">137 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> offset<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L138" class="LineNr">138 </span>        <span class="Delimiter">}</span>
-<span id="L139" class="LineNr">139 </span>        <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L140" class="LineNr">140 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>offset &gt; <span class="Constant">0xffff</span> || offset &lt; -<span class="Constant">0x7fff</span><span class="Delimiter">)</span>
-<span id="L141" class="LineNr">141 </span>            <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': <a href='003trace.cc.html#L73'>label</a> too far away for distance &quot;</span> &lt;&lt; std::hex &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; to fit in 16 bits</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L142" class="LineNr">142 </span>          <span class="Normal">else</span>
-<span id="L143" class="LineNr">143 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> offset<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L144" class="LineNr">144 </span>        <span class="Delimiter">}</span>
-<span id="L145" class="LineNr">145 </span>        <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span> || has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L146" class="LineNr">146 </span>          emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> offset<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">);</span>
-<span id="L147" class="LineNr">147 </span>        <span class="Delimiter">}</span>
-<span id="L148" class="LineNr">148 </span>      <span class="Delimiter">}</span>
-<span id="L149" class="LineNr">149 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L150" class="LineNr">150 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="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>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>
-<span id="L154" class="LineNr">154 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L186'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L155" class="LineNr">155 </span>  <span class="Delimiter">}</span>
-<span id="L156" class="LineNr">156 </span><span class="Delimiter">}</span>
-<span id="L157" class="LineNr">157 </span>
-<span id="L158" class="LineNr">158 </span><span class="Comment">// Assumes all bitfields are packed.</span>
-<span id="L159" class="LineNr">159 </span><span class="Normal">uint32_t</span> <a href='035labels.cc.html#L159'>num_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L160" class="LineNr">160 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L161" class="LineNr">161 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L162" class="LineNr">162 </span>    <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L163" class="LineNr">163 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span> || has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span>  <span class="Comment">// only multi-byte operands</span>
-<span id="L164" class="LineNr">164 </span>      sum += <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L165" class="LineNr">165 </span>    <span class="Normal">else</span>
-<span id="L166" class="LineNr">166 </span>      sum++<span class="Delimiter">;</span>
-<span id="L167" class="LineNr">167 </span>  <span class="Delimiter">}</span>
-<span id="L168" class="LineNr">168 </span>  <span class="Identifier">return</span> sum<span class="Delimiter">;</span>
-<span id="L169" class="LineNr">169 </span><span class="Delimiter">}</span>
-<span id="L170" class="LineNr">170 </span>
-<span id="L171" class="LineNr">171 </span>string <a href='035labels.cc.html#L171'>data_to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L172" class="LineNr">172 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L173" class="LineNr">173 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L174" class="LineNr">174 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
-<span id="L175" class="LineNr">175 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L111'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L118'>data</a><span class="Delimiter">;</span>
-<span id="L176" class="LineNr">176 </span>  <span class="Delimiter">}</span>
-<span id="L177" class="LineNr">177 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L178" class="LineNr">178 </span><span class="Delimiter">}</span>
-<span id="L179" class="LineNr">179 </span>
-<span id="L180" class="LineNr">180 </span>string <a href='035labels.cc.html#L180'>drop_last</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L181" class="LineNr">181 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>s<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> --s<span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">());</span>
-<span id="L182" class="LineNr">182 </span><span class="Delimiter">}</span>
-<span id="L183" class="LineNr">183 </span>
-<span id="L184" class="LineNr">184 </span><span class="Comment">//: Label definitions must be the first word on a line. No jumping inside</span>
-<span id="L185" class="LineNr">185 </span><span class="Comment">//: instructions.</span>
-<span id="L186" class="LineNr">186 </span><span class="Comment">//: They should also be the only word on a line.</span>
-<span id="L187" class="LineNr">187 </span><span class="Comment">//: However, you can absolutely have multiple labels map to the same address,</span>
-<span id="L188" class="LineNr">188 </span><span class="Comment">//: as long as they're on separate lines.</span>
+<span id="L48" class="LineNr"> 48 </span><span class="Delimiter">:(before &quot;End Level-2 Transforms&quot;)</span>
+<span id="L49" class="LineNr"> 49 </span><a href='011run.cc.html#L191'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='035labels.cc.html#L51'>rewrite_labels</a><span class="Delimiter">);</span>
+<span id="L50" class="LineNr"> 50 </span><span class="Delimiter">:(code)</span>
+<span id="L51" class="LineNr"> 51 </span><span class="Normal">void</span> <a href='035labels.cc.html#L51'>rewrite_labels</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L52" class="LineNr"> 52 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- rewrite labels&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L53" class="LineNr"> 53 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L54" class="LineNr"> 54 </span>  segment&amp; <a href='031check_operands.cc.html#L14'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span>  map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt; byte_index<span class="Delimiter">;</span>  <span class="Comment">// values are unsigned, but we're going to do subtractions on them so they need to fit in 31 bits</span>
+<span id="L56" class="LineNr"> 56 </span>  <a href='035labels.cc.html#L63'>compute_byte_indices_for_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L58" class="LineNr"> 58 </span>  <a href='035labels.cc.html#L100'>drop_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">);</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L60" class="LineNr"> 60 </span>  <a href='035labels.cc.html#L112'>replace_labels_with_displacements</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span>
+<span id="L61" class="LineNr"> 61 </span><span class="Delimiter">}</span>
+<span id="L62" class="LineNr"> 62 </span>
+<span id="L63" class="LineNr"> 63 </span><span class="Normal">void</span> <a href='035labels.cc.html#L63'>compute_byte_indices_for_labels</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt;&amp; byte_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Normal">int</span> current_byte = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L66" class="LineNr"> 66 </span>    <span class="Normal">const</span> line&amp; inst = <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L67" class="LineNr"> 67 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L68" class="LineNr"> 68 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L69" class="LineNr"> 69 </span>      <span class="Comment">// hack: if we have any operand metadata left after previous transforms,</span>
+<span id="L70" class="LineNr"> 70 </span>      <span class="Comment">// deduce its size</span>
+<span id="L71" class="LineNr"> 71 </span>      <span class="Comment">// Maybe we should just move this transform to before instruction</span>
+<span id="L72" class="LineNr"> 72 </span>      <span class="Comment">// packing, and deduce the size of *all* operands. But then we'll also</span>
+<span id="L73" class="LineNr"> 73 </span>      <span class="Comment">// have to deal with bitfields.</span>
+<span id="L74" class="LineNr"> 74 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span> || has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L75" class="LineNr"> 75 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">)</span>
+<span id="L76" class="LineNr"> 76 </span>          <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': don't use ':' when jumping to labels</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L77" class="LineNr"> 77 </span>        current_byte += <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L78" class="LineNr"> 78 </span>      <span class="Delimiter">}</span>
+<span id="L79" class="LineNr"> 79 </span>      <span class="Comment">// automatically handle /disp8 and /imm8 here</span>
+<span id="L80" class="LineNr"> 80 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L81" class="LineNr"> 81 </span>        ++current_byte<span class="Delimiter">;</span>
+<span id="L82" class="LineNr"> 82 </span>      <span class="Delimiter">}</span>
+<span id="L83" class="LineNr"> 83 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L84" class="LineNr"> 84 </span>        string <a href='003trace.cc.html#L73'>label</a> = <a href='035labels.cc.html#L156'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
+<span id="L85" class="LineNr"> 85 </span>        <span class="Comment">// ensure labels look sufficiently different from raw hex</span>
+<span id="L86" class="LineNr"> 86 </span>        <a href='035labels.cc.html#L21'>check_valid_name</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span>
+<span id="L87" class="LineNr"> 87 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L88" class="LineNr"> 88 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L382'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
+<span id="L89" class="LineNr"> 89 </span>          <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': <a href='003trace.cc.html#L73'>label</a> definition (':') not allowed in operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L90" class="LineNr"> 90 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
+<span id="L91" class="LineNr"> 91 </span>          <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': labels can only be the first <a href='011run.cc.html#L120'>word</a> in a line.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L92" class="LineNr"> 92 </span>        <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> current_byte<span class="Delimiter">);</span>
+<span id="L93" class="LineNr"> 93 </span>        <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' is at address &quot;</span> &lt;&lt; <span class="Delimiter">(</span>current_byte+code<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L94" class="LineNr"> 94 </span>        <span class="Comment">// no modifying current_byte; label definitions won't be in the final binary</span>
+<span id="L95" class="LineNr"> 95 </span>      <span class="Delimiter">}</span>
+<span id="L96" class="LineNr"> 96 </span>    <span class="Delimiter">}</span>
+<span id="L97" class="LineNr"> 97 </span>  <span class="Delimiter">}</span>
+<span id="L98" class="LineNr"> 98 </span><span class="Delimiter">}</span>
+<span id="L99" class="LineNr"> 99 </span>
+<span id="L100" class="LineNr">100 </span><span class="Normal">void</span> <a href='035labels.cc.html#L100'>drop_labels</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L102" class="LineNr">102 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L103" class="LineNr">103 </span>    vector&lt;word&gt;::iterator new_end = remove_if<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">(),</span> <a href='035labels.cc.html#L108'>is_label</a><span class="Delimiter">);</span>
+<span id="L104" class="LineNr">104 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>erase<span class="Delimiter">(</span>new_end<span class="Delimiter">,</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">());</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Delimiter">}</span>
+<span id="L106" class="LineNr">106 </span><span class="Delimiter">}</span>
+<span id="L107" class="LineNr">107 </span>
+<span id="L108" class="LineNr">108 </span><span class="Normal">bool</span> <a href='035labels.cc.html#L108'>is_label</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L109" class="LineNr">109 </span>  <span class="Identifier">return</span> *w<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">;</span>
+<span id="L110" class="LineNr">110 </span><span class="Delimiter">}</span>
+<span id="L111" class="LineNr">111 </span>
+<span id="L112" class="LineNr">112 </span><span class="Normal">void</span> <a href='035labels.cc.html#L112'>replace_labels_with_displacements</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt;&amp; byte_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L113" class="LineNr">113 </span>  <span class="Normal">int32_t</span> byte_index_next_instruction_starts_at = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L115" class="LineNr">115 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span>    byte_index_next_instruction_starts_at += <a href='034compute_segment_address.cc.html#L45'>num_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L117" class="LineNr">117 </span>    <a href='011run.cc.html#L114'>line</a> new_inst<span class="Delimiter">;</span>
+<span id="L118" class="LineNr">118 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L119" class="LineNr">119 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L120" class="LineNr">120 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L247'>contains_key</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L121" class="LineNr">121 </span>        <span class="Normal">int32_t</span> displacement = <span class="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span>get<span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">))</span> - byte_index_next_instruction_starts_at<span class="Delimiter">;</span>
+<span id="L122" class="LineNr">122 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">)</span> || has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L123" class="LineNr">123 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>displacement &gt; <span class="Constant">0xff</span> || displacement &lt; -<span class="Constant">0x7f</span><span class="Delimiter">)</span>
+<span id="L124" class="LineNr">124 </span>            <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': <a href='003trace.cc.html#L73'>label</a> too far away for displacement &quot;</span> &lt;&lt; std::hex &lt;&lt; displacement &lt;&lt; <span class="Constant">&quot; to fit in 8 bits</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L125" class="LineNr">125 </span>          <span class="Normal">else</span>
+<span id="L126" class="LineNr">126 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> displacement<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </span>        <span class="Delimiter">}</span>
+<span id="L128" class="LineNr">128 </span>        <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L129" class="LineNr">129 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>displacement &gt; <span class="Constant">0xffff</span> || displacement &lt; -<span class="Constant">0x7fff</span><span class="Delimiter">)</span>
+<span id="L130" class="LineNr">130 </span>            <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': <a href='003trace.cc.html#L73'>label</a> too far away for displacement &quot;</span> &lt;&lt; std::hex &lt;&lt; displacement &lt;&lt; <span class="Constant">&quot; to fit in 16 bits</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L131" class="LineNr">131 </span>          <span class="Normal">else</span>
+<span id="L132" class="LineNr">132 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> displacement<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L133" class="LineNr">133 </span>        <span class="Delimiter">}</span>
+<span id="L134" class="LineNr">134 </span>        <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span> || has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L135" class="LineNr">135 </span>          emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> displacement<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">);</span>
+<span id="L136" class="LineNr">136 </span>        <span class="Delimiter">}</span>
+<span id="L137" class="LineNr">137 </span>      <span class="Delimiter">}</span>
+<span id="L138" class="LineNr">138 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L139" class="LineNr">139 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L140" class="LineNr">140 </span>      <span class="Delimiter">}</span>
+<span id="L141" class="LineNr">141 </span>    <span class="Delimiter">}</span>
+<span id="L142" class="LineNr">142 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>
+<span id="L143" class="LineNr">143 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L193'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L144" class="LineNr">144 </span>  <span class="Delimiter">}</span>
+<span id="L145" class="LineNr">145 </span><span class="Delimiter">}</span>
+<span id="L146" class="LineNr">146 </span>
+<span id="L147" class="LineNr">147 </span>string <a href='035labels.cc.html#L147'>data_to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L148" class="LineNr">148 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L150" class="LineNr">150 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
+<span id="L151" class="LineNr">151 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">;</span>
+<span id="L152" class="LineNr">152 </span>  <span class="Delimiter">}</span>
+<span id="L153" class="LineNr">153 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L154" class="LineNr">154 </span><span class="Delimiter">}</span>
+<span id="L155" class="LineNr">155 </span>
+<span id="L156" class="LineNr">156 </span>string <a href='035labels.cc.html#L156'>drop_last</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L157" class="LineNr">157 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>s<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> --s<span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">());</span>
+<span id="L158" class="LineNr">158 </span><span class="Delimiter">}</span>
+<span id="L159" class="LineNr">159 </span>
+<span id="L160" class="LineNr">160 </span><span class="Comment">//: Label definitions must be the first word on a line. No jumping inside</span>
+<span id="L161" class="LineNr">161 </span><span class="Comment">//: instructions.</span>
+<span id="L162" class="LineNr">162 </span><span class="Comment">//: They should also be the only word on a line.</span>
+<span id="L163" class="LineNr">163 </span><span class="Comment">//: However, you can absolutely have multiple labels map to the same address,</span>
+<span id="L164" class="LineNr">164 </span><span class="Comment">//: as long as they're on separate lines.</span>
+<span id="L165" class="LineNr">165 </span>
+<span id="L166" class="LineNr">166 </span><span class="Delimiter">:(scenario multiple_labels_at)</span>
+<span id="L167" class="LineNr">167 </span>== <span class="Constant">0x1</span>
+<span id="L168" class="LineNr">168 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L169" class="LineNr">169 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L170" class="LineNr">170 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L171" class="LineNr">171 </span><span class="Comment"># address 1</span>
+<span id="L172" class="LineNr">172 </span><span class="Normal">loop</span>:
+<span id="L173" class="LineNr">173 </span> $loop2:
+<span id="L174" class="LineNr">174 </span><span class="Comment"># address 1 (labels take up no space)</span>
+<span id="L175" class="LineNr">175 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
+<span id="L176" class="LineNr">176 </span><span class="Comment"># address 6</span>
+<span id="L177" class="LineNr">177 </span>            eb                                                                                                              $loop2/disp8
+<span id="L178" class="LineNr">178 </span><span class="Comment"># address 8</span>
+<span id="L179" class="LineNr">179 </span>            eb                                                                                                              $loop3/disp8
+<span id="L180" class="LineNr">180 </span><span class="Comment"># address 0xa</span>
+<span id="L181" class="LineNr">181 </span> $loop3:
+<span id="L182" class="LineNr">182 </span><span class="traceContains">+transform: <a href='003trace.cc.html#L73'>label</a> 'loop' is at address 1</span>
+<span id="L183" class="LineNr">183 </span><span class="traceContains">+transform: <a href='003trace.cc.html#L73'>label</a> '$loop2' is at address 1</span>
+<span id="L184" class="LineNr">184 </span><span class="traceContains">+transform: <a href='003trace.cc.html#L73'>label</a> '$loop3' is at address a</span>
+<span id="L185" class="LineNr">185 </span><span class="Comment"># first jump is to -7</span>
+<span id="L186" class="LineNr">186 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L193'>transform</a>: 'eb f9'</span>
+<span id="L187" class="LineNr">187 </span><span class="Comment"># second jump is to 0 (fall through)</span>
+<span id="L188" class="LineNr">188 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L193'>transform</a>: 'eb 00'</span>
 <span id="L189" class="LineNr">189 </span>
-<span id="L190" class="LineNr">190 </span><span class="Delimiter">:(scenario multiple_labels_at)</span>
-<span id="L191" class="LineNr">191 </span>== <span class="Constant">0x1</span>
-<span id="L192" class="LineNr">192 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L193" class="LineNr">193 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L194" class="LineNr">194 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L195" class="LineNr">195 </span><span class="Comment"># address 1</span>
-<span id="L196" class="LineNr">196 </span><span class="Normal">loop</span>:
-<span id="L197" class="LineNr">197 </span> $loop2:
-<span id="L198" class="LineNr">198 </span><span class="Comment"># address 1 (labels take up no space)</span>
-<span id="L199" class="LineNr">199 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
-<span id="L200" class="LineNr">200 </span><span class="Comment"># address 6</span>
-<span id="L201" class="LineNr">201 </span>            eb                                                                                                              $loop2/disp8
-<span id="L202" class="LineNr">202 </span><span class="Comment"># address 8</span>
-<span id="L203" class="LineNr">203 </span>            eb                                                                                                              $loop3/disp8
-<span id="L204" class="LineNr">204 </span><span class="Comment"># address 0xa</span>
-<span id="L205" class="LineNr">205 </span> $loop3:
-<span id="L206" class="LineNr">206 </span><span class="traceContains">+transform: <a href='003trace.cc.html#L73'>label</a> 'loop' is at address 1</span>
-<span id="L207" class="LineNr">207 </span><span class="traceContains">+transform: <a href='003trace.cc.html#L73'>label</a> '$loop2' is at address 1</span>
-<span id="L208" class="LineNr">208 </span><span class="traceContains">+transform: <a href='003trace.cc.html#L73'>label</a> '$loop3' is at address a</span>
-<span id="L209" class="LineNr">209 </span><span class="Comment"># first jump is to -7</span>
-<span id="L210" class="LineNr">210 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L186'>transform</a>: 'eb f9'</span>
-<span id="L211" class="LineNr">211 </span><span class="Comment"># second jump is to 0 (fall through)</span>
-<span id="L212" class="LineNr">212 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L186'>transform</a>: 'eb 00'</span>
-<span id="L213" class="LineNr">213 </span>
-<span id="L214" class="LineNr">214 </span><span class="Delimiter">:(scenario label_too_short)</span>
-<span id="L215" class="LineNr">215 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L216" class="LineNr">216 </span>== <span class="Constant">0x1</span>
-<span id="L217" class="LineNr">217 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L218" class="LineNr">218 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L219" class="LineNr">219 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L220" class="LineNr">220 </span><span class="Normal">xz</span>:
-<span id="L221" class="LineNr">221 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
-<span id="L222" class="LineNr">222 </span><span class="traceContains">+error: 'xz' is two characters long which can look like raw hex bytes at a glance; use a different <a href='010---vm.cc.html#L228'>name</a></span>
-<span id="L223" class="LineNr">223 </span>
-<span id="L224" class="LineNr">224 </span><span class="Delimiter">:(scenario label_hex)</span>
-<span id="L225" class="LineNr">225 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L226" class="LineNr">226 </span>== <span class="Constant">0x1</span>
-<span id="L227" class="LineNr">227 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L228" class="LineNr">228 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L229" class="LineNr">229 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L230" class="LineNr">230 </span><span class="Constant">0xab</span>:
-<span id="L231" class="LineNr">231 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
-<span id="L232" class="LineNr">232 </span><span class="traceContains">+error: '0xab' looks like a hex number; use a different <a href='010---vm.cc.html#L228'>name</a></span>
-<span id="L233" class="LineNr">233 </span>
-<span id="L234" class="LineNr">234 </span><span class="Delimiter">:(scenario label_negative_hex)</span>
-<span id="L235" class="LineNr">235 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L236" class="LineNr">236 </span>== <span class="Constant">0x1</span>
-<span id="L237" class="LineNr">237 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L238" class="LineNr">238 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L239" class="LineNr">239 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L240" class="LineNr">240 </span> -a:  <span class="Comment"># indent to avoid looking like a trace_should_not_contain command for this scenario</span>
-<span id="L241" class="LineNr">241 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
-<span id="L242" class="LineNr">242 </span><span class="traceContains">+error: '-a' starts with '-', which can be confused with a negative number; use a different <a href='010---vm.cc.html#L228'>name</a></span>
+<span id="L190" class="LineNr">190 </span><span class="Delimiter">:(scenario label_too_short)</span>
+<span id="L191" class="LineNr">191 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L192" class="LineNr">192 </span>== <span class="Constant">0x1</span>
+<span id="L193" class="LineNr">193 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L194" class="LineNr">194 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L195" class="LineNr">195 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L196" class="LineNr">196 </span><span class="Normal">xz</span>:
+<span id="L197" class="LineNr">197 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
+<span id="L198" class="LineNr">198 </span><span class="traceContains">+error: 'xz' is two characters long which can look like raw hex bytes at a glance; use a different <a href='010---vm.cc.html#L228'>name</a></span>
+<span id="L199" class="LineNr">199 </span>
+<span id="L200" class="LineNr">200 </span><span class="Delimiter">:(scenario label_hex)</span>
+<span id="L201" class="LineNr">201 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L202" class="LineNr">202 </span>== <span class="Constant">0x1</span>
+<span id="L203" class="LineNr">203 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L204" class="LineNr">204 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L205" class="LineNr">205 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L206" class="LineNr">206 </span><span class="Constant">0xab</span>:
+<span id="L207" class="LineNr">207 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
+<span id="L208" class="LineNr">208 </span><span class="traceContains">+error: '0xab' looks like a hex number; use a different <a href='010---vm.cc.html#L228'>name</a></span>
+<span id="L209" class="LineNr">209 </span>
+<span id="L210" class="LineNr">210 </span><span class="Delimiter">:(scenario label_negative_hex)</span>
+<span id="L211" class="LineNr">211 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L212" class="LineNr">212 </span>== <span class="Constant">0x1</span>
+<span id="L213" class="LineNr">213 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L214" class="LineNr">214 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L215" class="LineNr">215 </span>          <span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L216" class="LineNr">216 </span> -a:  <span class="Comment"># indent to avoid looking like a trace_should_not_contain command for this scenario</span>
+<span id="L217" class="LineNr">217 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
+<span id="L218" class="LineNr">218 </span><span class="traceContains">+error: '-a' starts with '-', which can be confused with a negative number; use a different <a href='010---vm.cc.html#L228'>name</a></span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/036global_variables.cc.html b/html/subx/036global_variables.cc.html
new file mode 100644
index 00000000..d0ee5f16
--- /dev/null
+++ b/html/subx/036global_variables.cc.html
@@ -0,0 +1,178 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/036global_variables.cc</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="cpp">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<style type="text/css">
+<!--
+pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+a { color:#eeeeee; text-decoration: none; }
+a:hover { text-decoration: underline; }
+* { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.CommentedCode { color: #6c6c6c; }
+.PreProc { color: #800080; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr">  1 </span><span class="Comment">//: Global variables.</span>
+<span id="L2" class="LineNr">  2 </span><span class="Comment">//:</span>
+<span id="L3" class="LineNr">  3 </span><span class="Comment">//: Global variables are just labels in the data segment.</span>
+<span id="L4" class="LineNr">  4 </span><span class="Comment">//: However, they can only be used in imm32 and not disp32 operands. And they</span>
+<span id="L5" class="LineNr">  5 </span><span class="Comment">//: can't be used with jump and call instructions.</span>
+<span id="L6" class="LineNr">  6 </span><span class="Comment">//:</span>
+<span id="L7" class="LineNr">  7 </span><span class="Comment">//: This layer much the same structure as rewriting labels.</span>
+<span id="L8" class="LineNr">  8 </span>
+<span id="L9" class="LineNr">  9 </span><span class="Delimiter">:(scenario global_variable)</span>
+<span id="L10" class="LineNr"> 10 </span><span class="Special">% Mem_offset = CODE_START;</span>
+<span id="L11" class="LineNr"> 11 </span><span class="Special">% Mem.resize(0x2000);</span>
+<span id="L12" class="LineNr"> 12 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L13" class="LineNr"> 13 </span>b9/copy x/imm32  <span class="Comment"># copy to ECX</span>
+<span id="L14" class="LineNr"> 14 </span>== <a href='011run.cc.html#L122'>data</a>
+<span id="L15" class="LineNr"> 15 </span><span class="Normal">x</span>:
+<span id="L16" class="LineNr"> 16 </span><span class="PreProc">0</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">0</span>
+<span id="L17" class="LineNr"> 17 </span><span class="traceContains">+transform: global variable 'x' is at address 0x08049079</span>
+<span id="L18" class="LineNr"> 18 </span>
+<span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Level-2 Transforms&quot;)</span>
+<span id="L20" class="LineNr"> 20 </span><a href='011run.cc.html#L191'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='036global_variables.cc.html#L22'>rewrite_global_variables</a><span class="Delimiter">);</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Delimiter">:(code)</span>
+<span id="L22" class="LineNr"> 22 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L22'>rewrite_global_variables</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L23" class="LineNr"> 23 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- rewrite global variables&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L24" class="LineNr"> 24 </span>  map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt; address<span class="Delimiter">;</span>
+<span id="L25" class="LineNr"> 25 </span>  compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
+<span id="L26" class="LineNr"> 26 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L27" class="LineNr"> 27 </span>  <a href='036global_variables.cc.html#L60'>drop_global_variables</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L28" class="LineNr"> 28 </span>  <a href='036global_variables.cc.html#L65'>replace_global_variables_with_addresses</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
+<span id="L29" class="LineNr"> 29 </span><span class="Delimiter">}</span>
+<span id="L30" class="LineNr"> 30 </span>
+<span id="L31" class="LineNr"> 31 </span><span class="Normal">void</span> compute_addresses_for_global_variables<span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L14'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L33" class="LineNr"> 33 </span>    compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> address<span class="Delimiter">);</span>
+<span id="L34" class="LineNr"> 34 </span><span class="Delimiter">}</span>
+<span id="L35" class="LineNr"> 35 </span>
+<span id="L36" class="LineNr"> 36 </span><span class="Normal">void</span> compute_addresses_for_global_variables<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L37" class="LineNr"> 37 </span>  <span class="Normal">int</span> current_address = s<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a><span class="Delimiter">;</span>
+<span id="L38" class="LineNr"> 38 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L39" class="LineNr"> 39 </span>    <span class="Normal">const</span> line&amp; inst = s<span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L40" class="LineNr"> 40 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L41" class="LineNr"> 41 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L42" class="LineNr"> 42 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L43" class="LineNr"> 43 </span>        ++current_address<span class="Delimiter">;</span>
+<span id="L44" class="LineNr"> 44 </span>      <span class="Delimiter">}</span>
+<span id="L45" class="LineNr"> 45 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L46" class="LineNr"> 46 </span>        string variable = <a href='035labels.cc.html#L156'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
+<span id="L47" class="LineNr"> 47 </span>        <span class="Comment">// ensure variables look sufficiently different from raw hex</span>
+<span id="L48" class="LineNr"> 48 </span>        <a href='035labels.cc.html#L21'>check_valid_name</a><span class="Delimiter">(</span>variable<span class="Delimiter">);</span>
+<span id="L49" class="LineNr"> 49 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L50" class="LineNr"> 50 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
+<span id="L51" class="LineNr"> 51 </span>          <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': global variable names can only be the first <a href='011run.cc.html#L120'>word</a> in a line.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L52" class="LineNr"> 52 </span>        <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> variable<span class="Delimiter">,</span> current_address<span class="Delimiter">);</span>
+<span id="L53" class="LineNr"> 53 </span>        <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;global variable '&quot;</span> &lt;&lt; variable &lt;&lt; <span class="Constant">&quot;' is at address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; current_address &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L54" class="LineNr"> 54 </span>        <span class="Comment">// no modifying current_address; global variable definitions won't be in the final binary</span>
+<span id="L55" class="LineNr"> 55 </span>      <span class="Delimiter">}</span>
+<span id="L56" class="LineNr"> 56 </span>    <span class="Delimiter">}</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="Delimiter">}</span>
+<span id="L58" class="LineNr"> 58 </span><span class="Delimiter">}</span>
+<span id="L59" class="LineNr"> 59 </span>
+<span id="L60" class="LineNr"> 60 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L60'>drop_global_variables</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L61" class="LineNr"> 61 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L14'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L62" class="LineNr"> 62 </span>    <a href='035labels.cc.html#L100'>drop_labels</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L63" class="LineNr"> 63 </span><span class="Delimiter">}</span>
+<span id="L64" class="LineNr"> 64 </span>
+<span id="L65" class="LineNr"> 65 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L65'>replace_global_variables_with_addresses</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L67" class="LineNr"> 67 </span>  segment&amp; <a href='031check_operands.cc.html#L14'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L69" class="LineNr"> 69 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L70" class="LineNr"> 70 </span>    <a href='011run.cc.html#L114'>line</a> new_inst<span class="Delimiter">;</span>
+<span id="L71" class="LineNr"> 71 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L72" class="LineNr"> 72 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L73" class="LineNr"> 73 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L247'>contains_key</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L74" class="LineNr"> 74 </span>        <span class="Normal">uint32_t</span> value = get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
+<span id="L75" class="LineNr"> 75 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span>
+<span id="L76" class="LineNr"> 76 </span>          <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': <a href='011run.cc.html#L122'>data</a> variables should always be in '/imm32' operands</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L77" class="LineNr"> 77 </span>        emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> value<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">);</span>
+<span id="L78" class="LineNr"> 78 </span>      <span class="Delimiter">}</span>
+<span id="L79" class="LineNr"> 79 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L80" class="LineNr"> 80 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L81" class="LineNr"> 81 </span>      <span class="Delimiter">}</span>
+<span id="L82" class="LineNr"> 82 </span>    <span class="Delimiter">}</span>
+<span id="L83" class="LineNr"> 83 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>
+<span id="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L193'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="Delimiter">}</span>
+<span id="L86" class="LineNr"> 86 </span><span class="Delimiter">}</span>
+<span id="L87" class="LineNr"> 87 </span>
+<span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(scenario global_variable_disallowed_in_jump)</span>
+<span id="L89" class="LineNr"> 89 </span><span class="Special">% Mem_offset = CODE_START;</span>
+<span id="L90" class="LineNr"> 90 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L91" class="LineNr"> 91 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L92" class="LineNr"> 92 </span>eb/jump x/disp8
+<span id="L93" class="LineNr"> 93 </span>== <a href='011run.cc.html#L122'>data</a>
+<span id="L94" class="LineNr"> 94 </span><span class="Normal">x</span>:
+<span id="L95" class="LineNr"> 95 </span><span class="PreProc">0</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">0</span>
+<span id="L96" class="LineNr"> 96 </span><span class="traceContains">+error: 'eb/jump x/disp8': <a href='011run.cc.html#L122'>data</a> variables should always be in '/imm32' operands</span>
+<span id="L97" class="LineNr"> 97 </span><span class="Comment"># sub-optimal error message; should be</span>
+<span id="L98" class="LineNr"> 98 </span><span class="CommentedCode">#? +error: can't jump to data (variable 'x')</span>
+<span id="L99" class="LineNr"> 99 </span>
+<span id="L100" class="LineNr">100 </span><span class="Delimiter">:(scenario global_variable_disallowed_in_call)</span>
+<span id="L101" class="LineNr">101 </span><span class="Special">% Mem_offset = CODE_START;</span>
+<span id="L102" class="LineNr">102 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L103" class="LineNr">103 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L104" class="LineNr">104 </span>e8/call x/disp32
+<span id="L105" class="LineNr">105 </span>== <a href='011run.cc.html#L122'>data</a>
+<span id="L106" class="LineNr">106 </span><span class="Normal">x</span>:
+<span id="L107" class="LineNr">107 </span><span class="PreProc">0</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">0</span>
+<span id="L108" class="LineNr">108 </span><span class="traceContains">+error: 'e8/call x/disp32': <a href='011run.cc.html#L122'>data</a> variables should always be in '/imm32' operands</span>
+<span id="L109" class="LineNr">109 </span><span class="Comment"># sub-optimal error message; should be</span>
+<span id="L110" class="LineNr">110 </span><span class="CommentedCode">#? +error: can't call a data variable ('x')</span>
+<span id="L111" class="LineNr">111 </span><span class="Comment"># also, what about function pointers?</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/ex7.subx.html b/html/subx/apps/factorial.subx.html
index baa9076f..c695cb3c 100644
--- a/html/subx/ex7.subx.html
+++ b/html/subx/apps/factorial.subx.html
@@ -2,24 +2,24 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/ex7.subx</title>
-<meta name="Generator" content="Vim/7.4">
+<title>Mu - subx/apps/factorial.subx</title>
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
-<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
 <meta name="colorscheme" content="minimal">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
-.Delimiter { color: #800080; }
 .LineNr { color: #444444; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -57,13 +57,13 @@ if ('onhashchange' in window) {
 <span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## compute the factorial of 5, and return the result in the exit code</span>
 <span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
 <span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run:</span>
-<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate ex7.subx ex7</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run ex7</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate apps/factorial.subx apps/factorial</span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run apps/factorial</span>
 <span id="L6" class="LineNr"> 6 </span><span class="Comment"># Expected result:</span>
 <span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ echo $?</span>
 <span id="L8" class="LineNr"> 8 </span><span class="Comment">#   120</span>
 <span id="L9" class="LineNr"> 9 </span>
-<span id="L10" class="LineNr">10 </span>== 0x08048054  <span class="Comment"># code segment, after leaving room for ELF header</span>
+<span id="L10" class="LineNr">10 </span>== <a href='031check_operands.cc.html#L14'>code</a>
 <span id="L11" class="LineNr">11 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L12" class="LineNr">12 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L13" class="LineNr">13 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
diff --git a/html/subx/ex8.subx.html b/html/subx/ex8.subx.html
deleted file mode 100644
index 70433c87..00000000
--- a/html/subx/ex8.subx.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/ex8.subx</title>
-<meta name="Generator" content="Vim/7.4">
-<meta name="plugin-version" content="vim7.4_v2">
-<meta name="syntax" content="none">
-<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
-<style type="text/css">
-<!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-a { color:#eeeeee; text-decoration: none; }
-a:hover { text-decoration: underline; }
-* { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
--->
-</style>
-
-<script type='text/javascript'>
-<!--
-
-/* function to open any folds containing a jumped-to line before jumping to it */
-function JumpToLine()
-{
-  var lineNum;
-  lineNum = window.location.hash;
-  lineNum = lineNum.substr(1); /* strip off '#' */
-
-  if (lineNum.indexOf('L') == -1) {
-    lineNum = 'L'+lineNum;
-  }
-  lineElem = document.getElementById(lineNum);
-  /* Always jump to new location even if the line was hidden inside a fold, or
-   * we corrected the raw number to a line ID.
-   */
-  if (lineElem) {
-    lineElem.scrollIntoView(true);
-  }
-  return true;
-}
-if ('onhashchange' in window) {
-  window.onhashchange = JumpToLine;
-}
-
--->
-</script>
-</head>
-<body onload='JumpToLine();'>
-<pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## example showing file syscalls</span>
-<span id="L2" class="LineNr"> 2 </span><span class="Comment"># Create a file, open it for writing, write a character to it, close it, open</span>
-<span id="L3" class="LineNr"> 3 </span><span class="Comment"># it for reading, read a character from it, close it, delete it, and return</span>
-<span id="L4" class="LineNr"> 4 </span><span class="Comment"># the character read.</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment">#</span>
-<span id="L6" class="LineNr"> 6 </span><span class="Comment"># To run:</span>
-<span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ subx translate ex8.subx ex8</span>
-<span id="L8" class="LineNr"> 8 </span><span class="Comment">#   $ subx run ex8</span>
-<span id="L9" class="LineNr"> 9 </span><span class="Comment"># Expected result:</span>
-<span id="L10" class="LineNr">10 </span><span class="Comment">#   $ echo $?</span>
-<span id="L11" class="LineNr">11 </span><span class="Comment">#   97</span>
-<span id="L12" class="LineNr">12 </span>
-<span id="L13" class="LineNr">13 </span>== 0x08048074  <span class="Comment"># code segment, after leaving room for ELF header and segment headers</span>
-<span id="L14" class="LineNr">14 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L15" class="LineNr">15 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L16" class="LineNr">16 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L17" class="LineNr">17 </span>
-<span id="L18" class="LineNr">18 </span>  <span class="SalientComment">## creat(filename)</span>
-<span id="L19" class="LineNr">19 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x08049131/imm32/fname  <span class="Comment"># copy to EBX</span>
-<span id="L20" class="LineNr">20 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x180/imm32/fixed-perms <span class="Comment"># copy 0 to ECX</span>
-<span id="L21" class="LineNr">21 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32/creat           <span class="Comment"># copy 8 to EAX</span>
-<span id="L22" class="LineNr">22 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
-<span id="L23" class="LineNr">23 </span>
-<span id="L24" class="LineNr">24 </span>  <span class="SalientComment">## fd = open(filename, O_WRONLY, 0)</span>
-<span id="L25" class="LineNr">25 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x08049131/imm32/fname  <span class="Comment"># copy to EBX</span>
-<span id="L26" class="LineNr">26 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/wronly          <span class="Comment"># copy 1 to ECX</span>
-<span id="L27" class="LineNr">27 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x180/imm32/fixed-perms <span class="Comment"># copy 0 to EDX</span>
-<span id="L28" class="LineNr">28 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              5/imm32/open            <span class="Comment"># copy 5 to EAX</span>
-<span id="L29" class="LineNr">29 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
-<span id="L30" class="LineNr">30 </span>  <span class="Comment"># save fd</span>
-<span id="L31" class="LineNr">31 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x08049125/imm32/fd     <span class="Comment"># copy to EBX</span>
-<span id="L32" class="LineNr">32 </span>  89/copy                         0/mod/indirect  3/rm32/EBX                                          0/r32/EAX                                           <span class="Comment"># copy EAX to *EBX</span>
-<span id="L33" class="LineNr">33 </span>
-<span id="L34" class="LineNr">34 </span>  <span class="SalientComment">## write(fd, &quot;a&quot;, 1)</span>
-<span id="L35" class="LineNr">35 </span>  <span class="Comment"># load fd</span>
-<span id="L36" class="LineNr">36 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x08049125/imm32/fd     <span class="Comment"># copy to EBX</span>
-<span id="L37" class="LineNr">37 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
-<span id="L38" class="LineNr">38 </span>  <span class="Comment">#</span>
-<span id="L39" class="LineNr">39 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x08049129/imm32/a      <span class="Comment"># copy to ECX</span>
-<span id="L40" class="LineNr">40 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/size            <span class="Comment"># copy 1 to EDX</span>
-<span id="L41" class="LineNr">41 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write           <span class="Comment"># copy 4 to EAX</span>
-<span id="L42" class="LineNr">42 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
-<span id="L43" class="LineNr">43 </span>
-<span id="L44" class="LineNr">44 </span>  <span class="SalientComment">## close(fd)</span>
-<span id="L45" class="LineNr">45 </span>  <span class="Comment"># load fd</span>
-<span id="L46" class="LineNr">46 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x08049125/imm32/fd     <span class="Comment"># copy to EBX</span>
-<span id="L47" class="LineNr">47 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
-<span id="L48" class="LineNr">48 </span>  <span class="Comment">#</span>
-<span id="L49" class="LineNr">49 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              6/imm32/close           <span class="Comment"># copy 6 to EAX</span>
-<span id="L50" class="LineNr">50 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
-<span id="L51" class="LineNr">51 </span>
-<span id="L52" class="LineNr">52 </span>  <span class="SalientComment">## fd = open(filename, O_RDONLY, 0)</span>
-<span id="L53" class="LineNr">53 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x08049131/imm32/fname  <span class="Comment"># copy to EBX</span>
-<span id="L54" class="LineNr">54 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32/rdonly          <span class="Comment"># copy 0 to ECX</span>
-<span id="L55" class="LineNr">55 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x180/imm32/fixed-perms <span class="Comment"># copy 0 to EDX</span>
-<span id="L56" class="LineNr">56 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              5/imm32/open            <span class="Comment"># copy 5 to EAX</span>
-<span id="L57" class="LineNr">57 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
-<span id="L58" class="LineNr">58 </span>  <span class="Comment"># save fd</span>
-<span id="L59" class="LineNr">59 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x08049125/imm32/fd     <span class="Comment"># copy to EBX</span>
-<span id="L60" class="LineNr">60 </span>  89/copy                         0/mod/indirect  3/rm32/EBX                                          0/r32/EAX                                           <span class="Comment"># copy EAX to *EBX</span>
-<span id="L61" class="LineNr">61 </span>
-<span id="L62" class="LineNr">62 </span>  <span class="SalientComment">## read(fd, b, 1)</span>
-<span id="L63" class="LineNr">63 </span>  <span class="Comment"># load fd</span>
-<span id="L64" class="LineNr">64 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x08049125/imm32/fd     <span class="Comment"># copy to EBX</span>
-<span id="L65" class="LineNr">65 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
-<span id="L66" class="LineNr">66 </span>  <span class="Comment">#</span>
-<span id="L67" class="LineNr">67 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x0804912d/imm32/b      <span class="Comment"># copy to ECX</span>
-<span id="L68" class="LineNr">68 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/size            <span class="Comment"># copy 1 to EDX</span>
-<span id="L69" class="LineNr">69 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              3/imm32/read            <span class="Comment"># copy 3 to EAX</span>
-<span id="L70" class="LineNr">70 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
-<span id="L71" class="LineNr">71 </span>
-<span id="L72" class="LineNr">72 </span>  <span class="SalientComment">## close(fd)</span>
-<span id="L73" class="LineNr">73 </span>  <span class="Comment"># load fd</span>
-<span id="L74" class="LineNr">74 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x08049125/imm32/fd     <span class="Comment"># copy to EBX</span>
-<span id="L75" class="LineNr">75 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
-<span id="L76" class="LineNr">76 </span>  <span class="Comment">#</span>
-<span id="L77" class="LineNr">77 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              6/imm32/close           <span class="Comment"># copy 8 to EAX</span>
-<span id="L78" class="LineNr">78 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
-<span id="L79" class="LineNr">79 </span>
-<span id="L80" class="LineNr">80 </span>  <span class="SalientComment">## unlink(filename)</span>
-<span id="L81" class="LineNr">81 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x08049131/imm32/fname  <span class="Comment"># copy to EBX</span>
-<span id="L82" class="LineNr">82 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xa/imm32/unlink        <span class="Comment"># copy 8 to EAX</span>
-<span id="L83" class="LineNr">83 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
-<span id="L84" class="LineNr">84 </span>
-<span id="L85" class="LineNr">85 </span>  <span class="SalientComment">## exit(b)</span>
-<span id="L86" class="LineNr">86 </span>  <span class="Comment"># load b</span>
-<span id="L87" class="LineNr">87 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x0804912d/imm32/b      <span class="Comment"># copy to EBX</span>
-<span id="L88" class="LineNr">88 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
-<span id="L89" class="LineNr">89 </span>  <span class="Comment">#</span>
-<span id="L90" class="LineNr">90 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit            <span class="Comment"># copy 1 to EAX</span>
-<span id="L91" class="LineNr">91 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
-<span id="L92" class="LineNr">92 </span>
-<span id="L93" class="LineNr">93 </span>== 0x08049125  <span class="Comment"># data segment</span>
-<span id="L94" class="LineNr">94 </span>00 00 00 00  <span class="Comment"># fd</span>
-<span id="L95" class="LineNr">95 </span>61 00 00 00  <span class="Comment"># a: string to write to file: 'a'</span>
-<span id="L96" class="LineNr">96 </span>00 00 00 00  <span class="Comment"># b: space for string read from file</span>
-<span id="L97" class="LineNr">97 </span>2e 66 6f 6f 00 00 00 00  <span class="Comment"># filename: '.foo'</span>
-<span id="L98" class="LineNr">98 </span>
-<span id="L99" class="LineNr">99 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:tw&amp;</span>
-</pre>
-</body>
-</html>
-<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/ex1.1.subx.html b/html/subx/examples/ex1.1.subx.html
index 1a4c154d..bb74b710 100644
--- a/html/subx/ex1.1.subx.html
+++ b/html/subx/examples/ex1.1.subx.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/ex1.1.subx</title>
-<meta name="Generator" content="Vim/7.4">
+<title>Mu - subx/examples/ex1.1.subx</title>
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,10 +15,10 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
 .LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -63,7 +63,7 @@ if ('onhashchange' in window) {
 <span id="L8" class="LineNr"> 8 </span><span class="Comment">#   $ echo $?</span>
 <span id="L9" class="LineNr"> 9 </span><span class="Comment">#   42</span>
 <span id="L10" class="LineNr">10 </span>
-<span id="L11" class="LineNr">11 </span>== 0x08048054  <span class="Comment"># code segment, after leaving room for ELF header</span>
+<span id="L11" class="LineNr">11 </span>== <a href='031check_operands.cc.html#L14'>code</a>
 <span id="L12" class="LineNr">12 </span><span class="Comment"># opcode        ModR/M                    SIB                   displacement    immediate</span>
 <span id="L13" class="LineNr">13 </span><span class="Comment"># instruction   mod, reg, Reg/Mem bits    scale, index, base</span>
 <span id="L14" class="LineNr">14 </span><span class="Comment"># 1-3 bytes     0/1 byte                  0/1 byte              0/1/2/4 bytes   0/1/2/4 bytes</span>
diff --git a/html/subx/ex1.2.subx.html b/html/subx/examples/ex1.2.subx.html
index 61400270..169797e8 100644
--- a/html/subx/ex1.2.subx.html
+++ b/html/subx/examples/ex1.2.subx.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/ex1.2.subx</title>
-<meta name="Generator" content="Vim/7.4">
+<title>Mu - subx/examples/ex1.2.subx</title>
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,10 +15,10 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
 .LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -63,7 +63,7 @@ if ('onhashchange' in window) {
 <span id="L8" class="LineNr"> 8 </span><span class="Comment">#   $ echo $?</span>
 <span id="L9" class="LineNr"> 9 </span><span class="Comment">#   42</span>
 <span id="L10" class="LineNr">10 </span>
-<span id="L11" class="LineNr">11 </span>== 0x08048054  <span class="Comment"># code segment, after leaving room for ELF header</span>
+<span id="L11" class="LineNr">11 </span>== <a href='031check_operands.cc.html#L14'>code</a>
 <span id="L12" class="LineNr">12 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L13" class="LineNr">13 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L14" class="LineNr">14 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
diff --git a/html/subx/ex2.subx.html b/html/subx/examples/ex2.subx.html
index f0b0bc75..0ec3069a 100644
--- a/html/subx/ex2.subx.html
+++ b/html/subx/examples/ex2.subx.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/ex2.subx</title>
-<meta name="Generator" content="Vim/7.4">
+<title>Mu - subx/examples/ex2.subx</title>
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,10 +15,10 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
 .LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -62,7 +62,7 @@ if ('onhashchange' in window) {
 <span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ echo $?</span>
 <span id="L8" class="LineNr"> 8 </span><span class="Comment">#   2</span>
 <span id="L9" class="LineNr"> 9 </span>
-<span id="L10" class="LineNr">10 </span>== 0x08048054  <span class="Comment"># code segment, after leaving room for ELF header</span>
+<span id="L10" class="LineNr">10 </span>== <a href='031check_operands.cc.html#L14'>code</a>
 <span id="L11" class="LineNr">11 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L12" class="LineNr">12 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L13" class="LineNr">13 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
diff --git a/html/subx/ex3.subx.html b/html/subx/examples/ex3.subx.html
index 24ee6230..1118bc53 100644
--- a/html/subx/ex3.subx.html
+++ b/html/subx/examples/ex3.subx.html
@@ -2,23 +2,23 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/ex3.subx</title>
-<meta name="Generator" content="Vim/7.4">
+<title>Mu - subx/examples/ex3.subx</title>
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
-<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
 <meta name="colorscheme" content="minimal">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
 .LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -62,7 +62,7 @@ if ('onhashchange' in window) {
 <span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ echo $?</span>
 <span id="L8" class="LineNr"> 8 </span><span class="Comment">#   55</span>
 <span id="L9" class="LineNr"> 9 </span>
-<span id="L10" class="LineNr">10 </span>== 0x08048054  <span class="Comment"># code segment, after leaving room for ELF header</span>
+<span id="L10" class="LineNr">10 </span>== <a href='031check_operands.cc.html#L14'>code</a>
 <span id="L11" class="LineNr">11 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L12" class="LineNr">12 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L13" class="LineNr">13 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
diff --git a/html/subx/ex4.subx.html b/html/subx/examples/ex4.subx.html
index 3b8fc4cf..8191b5c5 100644
--- a/html/subx/ex4.subx.html
+++ b/html/subx/examples/ex4.subx.html
@@ -2,23 +2,23 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/ex4.subx</title>
-<meta name="Generator" content="Vim/7.4">
+<title>Mu - subx/examples/ex4.subx</title>
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
-<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
 <meta name="colorscheme" content="minimal">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
 .LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -59,7 +59,7 @@ if ('onhashchange' in window) {
 <span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate ex4.subx ex4</span>
 <span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run ex4</span>
 <span id="L6" class="LineNr"> 6 </span>
-<span id="L7" class="LineNr"> 7 </span>== 0x08048074  <span class="Comment"># code segment, after leaving room for ELF header and segment headers</span>
+<span id="L7" class="LineNr"> 7 </span>== <a href='031check_operands.cc.html#L14'>code</a>
 <span id="L8" class="LineNr"> 8 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L9" class="LineNr"> 9 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L10" class="LineNr">10 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
@@ -68,7 +68,7 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr">13 </span>  <span class="Comment"># fd = 0 (stdin)</span>
 <span id="L14" class="LineNr">14 </span>  bb/copy                                                                                                                         0/imm32           <span class="Comment"># copy 0 to EBX</span>
 <span id="L15" class="LineNr">15 </span>  <span class="Comment"># initialize x (location to write result to)</span>
-<span id="L16" class="LineNr">16 </span>  b9/copy                                                                                                                         0x080490a7/imm32  <span class="Comment"># copy to ECX</span>
+<span id="L16" class="LineNr">16 </span>  b9/copy                                                                                                                         x/imm32           <span class="Comment"># copy to ECX</span>
 <span id="L17" class="LineNr">17 </span>  <span class="Comment"># size = 1 character</span>
 <span id="L18" class="LineNr">18 </span>  ba/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EDX</span>
 <span id="L19" class="LineNr">19 </span>  <span class="Comment"># read(fd, x, size)</span>
@@ -79,7 +79,7 @@ if ('onhashchange' in window) {
 <span id="L24" class="LineNr">24 </span>  <span class="Comment"># fd = 1 (stdout)</span>
 <span id="L25" class="LineNr">25 </span>  bb/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EBX</span>
 <span id="L26" class="LineNr">26 </span>  <span class="Comment"># initialize x (location to read from)</span>
-<span id="L27" class="LineNr">27 </span>  b9/copy                                                                                                                         0x080490a7/imm32  <span class="Comment"># copy to ECX</span>
+<span id="L27" class="LineNr">27 </span>  b9/copy                                                                                                                         x/imm32           <span class="Comment"># copy to ECX</span>
 <span id="L28" class="LineNr">28 </span>  <span class="Comment"># size = 1 character</span>
 <span id="L29" class="LineNr">29 </span>  ba/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EDX</span>
 <span id="L30" class="LineNr">30 </span>  <span class="Comment"># write(fd, x, size)</span>
@@ -90,10 +90,11 @@ if ('onhashchange' in window) {
 <span id="L35" class="LineNr">35 </span>  b8/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EAX</span>
 <span id="L36" class="LineNr">36 </span>  cd/syscall                                                                                                                      0x80/imm8         <span class="Comment"># int 80h</span>
 <span id="L37" class="LineNr">37 </span>
-<span id="L38" class="LineNr">38 </span>== 0x080490a7  <span class="Comment"># data segment</span>
-<span id="L39" class="LineNr">39 </span>00 00 00 00  <span class="Comment"># space for read() to write to</span>
-<span id="L40" class="LineNr">40 </span>
-<span id="L41" class="LineNr">41 </span><span class="Comment"># vim&#0058;ft=subx:nowrap</span>
+<span id="L38" class="LineNr">38 </span>== <a href='011run.cc.html#L122'>data</a>
+<span id="L39" class="LineNr">39 </span>x:
+<span id="L40" class="LineNr">40 </span>00 00 00 00  <span class="Comment"># space for read() to write to</span>
+<span id="L41" class="LineNr">41 </span>
+<span id="L42" class="LineNr">42 </span><span class="Comment"># vim&#0058;ft=subx:nowrap</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/ex5.subx.html b/html/subx/examples/ex5.subx.html
index 297f0ab2..ea095cba 100644
--- a/html/subx/ex5.subx.html
+++ b/html/subx/examples/ex5.subx.html
@@ -2,23 +2,23 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/ex5.subx</title>
-<meta name="Generator" content="Vim/7.4">
+<title>Mu - subx/examples/ex5.subx</title>
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
-<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
 <meta name="colorscheme" content="minimal">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
 .LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -59,7 +59,7 @@ if ('onhashchange' in window) {
 <span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate ex5.subx ex5</span>
 <span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run ex5</span>
 <span id="L6" class="LineNr"> 6 </span>
-<span id="L7" class="LineNr"> 7 </span>== 0x08048054  <span class="Comment"># code segment, after leaving room for ELF header and segment headers</span>
+<span id="L7" class="LineNr"> 7 </span>== <a href='031check_operands.cc.html#L14'>code</a>
 <span id="L8" class="LineNr"> 8 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L9" class="LineNr"> 9 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L10" class="LineNr">10 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
diff --git a/html/subx/ex6.subx.html b/html/subx/examples/ex6.subx.html
index 9d146d32..3ae33645 100644
--- a/html/subx/ex6.subx.html
+++ b/html/subx/examples/ex6.subx.html
@@ -2,23 +2,23 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/ex6.subx</title>
-<meta name="Generator" content="Vim/7.4">
+<title>Mu - subx/examples/ex6.subx</title>
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
-<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
 <meta name="colorscheme" content="minimal">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
 .LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -60,7 +60,7 @@ if ('onhashchange' in window) {
 <span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run ex6</span>
 <span id="L6" class="LineNr"> 6 </span><span class="Comment">#   Hello, world!</span>
 <span id="L7" class="LineNr"> 7 </span>
-<span id="L8" class="LineNr"> 8 </span>== 0x08048074  <span class="Comment"># code segment, after leaving room for ELF header and segment headers</span>
+<span id="L8" class="LineNr"> 8 </span>== <a href='031check_operands.cc.html#L14'>code</a>
 <span id="L9" class="LineNr"> 9 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L10" class="LineNr">10 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L11" class="LineNr">11 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
@@ -69,9 +69,9 @@ if ('onhashchange' in window) {
 <span id="L14" class="LineNr">14 </span>  <span class="Comment"># fd = 1 (stdout)</span>
 <span id="L15" class="LineNr">15 </span>  bb/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EBX</span>
 <span id="L16" class="LineNr">16 </span>  <span class="Comment"># initialize x (location to write result to)</span>
-<span id="L17" class="LineNr">17 </span>  b9/copy                                                                                                                         0x08049097/imm32  <span class="Comment"># copy to ECX</span>
+<span id="L17" class="LineNr">17 </span>  b9/copy                                                                                                                         x/imm32           <span class="Comment"># copy to ECX</span>
 <span id="L18" class="LineNr">18 </span>  <span class="Comment"># initialize size</span>
-<span id="L19" class="LineNr">19 </span>  ba/copy                                                                                                                         0x08049093/imm32  <span class="Comment"># copy to EDX</span>
+<span id="L19" class="LineNr">19 </span>  ba/copy                                                                                                                         size/imm32        <span class="Comment"># copy to EDX</span>
 <span id="L20" class="LineNr">20 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX                                          2/r32/EDX                                     <span class="Comment"># copy *EDX to EDX</span>
 <span id="L21" class="LineNr">21 </span>  <span class="Comment"># write(fd, x, size)</span>
 <span id="L22" class="LineNr">22 </span>  b8/copy                                                                                                                         4/imm32           <span class="Comment"># copy 4 to EAX</span>
@@ -81,10 +81,10 @@ if ('onhashchange' in window) {
 <span id="L26" class="LineNr">26 </span>  b8/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EAX</span>
 <span id="L27" class="LineNr">27 </span>  cd/syscall                                                                                                                      0x80/imm8         <span class="Comment"># int 80h</span>
 <span id="L28" class="LineNr">28 </span>
-<span id="L29" class="LineNr">29 </span>== 0x08049093  <span class="Comment"># data segment</span>
-<span id="L30" class="LineNr">30 </span><span class="Comment"># size of string</span>
-<span id="L31" class="LineNr">31 </span>0e 00 00 00
-<span id="L32" class="LineNr">32 </span><span class="Comment"># string</span>
+<span id="L29" class="LineNr">29 </span>== <a href='011run.cc.html#L122'>data</a>
+<span id="L30" class="LineNr">30 </span>size:  <span class="Comment"># size of string</span>
+<span id="L31" class="LineNr">31 </span>  0e 00 00 00  <span class="Comment"># 14</span>
+<span id="L32" class="LineNr">32 </span>x:  <span class="Comment"># string to print</span>
 <span id="L33" class="LineNr">33 </span>  48 65 6c 6c 6f 2c 20 77 6f 72 6c 64 21 0a       00
 <span id="L34" class="LineNr">34 </span><span class="Comment"># h  e  l  l  o  ,  ␣  w  o  r  l  d  !  newline  null</span>
 <span id="L35" class="LineNr">35 </span>
diff --git a/html/subx/examples/ex7.subx.html b/html/subx/examples/ex7.subx.html
new file mode 100644
index 00000000..ecf0f0f8
--- /dev/null
+++ b/html/subx/examples/ex7.subx.html
@@ -0,0 +1,163 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/examples/ex7.subx</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<style type="text/css">
+<!--
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
+body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+a { color:#eeeeee; text-decoration: none; }
+a:hover { text-decoration: underline; }
+* { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
+.Delimiter { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr">  1 </span><span class="SalientComment">## example showing file syscalls</span>
+<span id="L2" class="LineNr">  2 </span><span class="Comment"># Create a file, open it for writing, write a character to it, close it, open</span>
+<span id="L3" class="LineNr">  3 </span><span class="Comment"># it for reading, read a character from it, close it, delete it, and return</span>
+<span id="L4" class="LineNr">  4 </span><span class="Comment"># the character read.</span>
+<span id="L5" class="LineNr">  5 </span><span class="Comment">#</span>
+<span id="L6" class="LineNr">  6 </span><span class="Comment"># To run:</span>
+<span id="L7" class="LineNr">  7 </span><span class="Comment">#   $ subx translate ex8.subx ex8</span>
+<span id="L8" class="LineNr">  8 </span><span class="Comment">#   $ subx run ex8</span>
+<span id="L9" class="LineNr">  9 </span><span class="Comment"># Expected result:</span>
+<span id="L10" class="LineNr"> 10 </span><span class="Comment">#   $ echo $?</span>
+<span id="L11" class="LineNr"> 11 </span><span class="Comment">#   97</span>
+<span id="L12" class="LineNr"> 12 </span>
+<span id="L13" class="LineNr"> 13 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L14" class="LineNr"> 14 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L15" class="LineNr"> 15 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L16" class="LineNr"> 16 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L17" class="LineNr"> 17 </span>
+<span id="L18" class="LineNr"> 18 </span>  <span class="SalientComment">## creat(filename)</span>
+<span id="L19" class="LineNr"> 19 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              filename/imm32          <span class="Comment"># copy to EBX</span>
+<span id="L20" class="LineNr"> 20 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x180/imm32/fixed-perms <span class="Comment"># copy to ECX</span>
+<span id="L21" class="LineNr"> 21 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32/creat           <span class="Comment"># copy 8 to EAX</span>
+<span id="L22" class="LineNr"> 22 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
+<span id="L23" class="LineNr"> 23 </span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="SalientComment">## stream = open(filename, O_WRONLY, 0)  # we can't use 'fd' because it looks like a hex byte</span>
+<span id="L25" class="LineNr"> 25 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              filename/imm32          <span class="Comment"># copy to EBX</span>
+<span id="L26" class="LineNr"> 26 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/wronly          <span class="Comment"># copy 1 to ECX</span>
+<span id="L27" class="LineNr"> 27 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x180/imm32/fixed-perms <span class="Comment"># copy 0 to EDX</span>
+<span id="L28" class="LineNr"> 28 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              5/imm32/open            <span class="Comment"># copy 5 to EAX</span>
+<span id="L29" class="LineNr"> 29 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="Comment"># save stream</span>
+<span id="L31" class="LineNr"> 31 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              stream/imm32            <span class="Comment"># copy to EBX</span>
+<span id="L32" class="LineNr"> 32 </span>  89/copy                         0/mod/indirect  3/rm32/EBX                                          0/r32/EAX                                           <span class="Comment"># copy EAX to *EBX</span>
+<span id="L33" class="LineNr"> 33 </span>
+<span id="L34" class="LineNr"> 34 </span>  <span class="SalientComment">## write(stream, &quot;a&quot;, 1)</span>
+<span id="L35" class="LineNr"> 35 </span>  <span class="Comment"># load stream</span>
+<span id="L36" class="LineNr"> 36 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              stream/imm32            <span class="Comment"># copy to EBX</span>
+<span id="L37" class="LineNr"> 37 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
+<span id="L38" class="LineNr"> 38 </span>  <span class="Comment">#</span>
+<span id="L39" class="LineNr"> 39 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              a/imm32                 <span class="Comment"># copy to ECX</span>
+<span id="L40" class="LineNr"> 40 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/size            <span class="Comment"># copy 1 to EDX</span>
+<span id="L41" class="LineNr"> 41 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write           <span class="Comment"># copy 4 to EAX</span>
+<span id="L42" class="LineNr"> 42 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
+<span id="L43" class="LineNr"> 43 </span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="SalientComment">## close(stream)</span>
+<span id="L45" class="LineNr"> 45 </span>  <span class="Comment"># load stream</span>
+<span id="L46" class="LineNr"> 46 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              stream/imm32            <span class="Comment"># copy to EBX</span>
+<span id="L47" class="LineNr"> 47 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="Comment">#</span>
+<span id="L49" class="LineNr"> 49 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              6/imm32/close           <span class="Comment"># copy 6 to EAX</span>
+<span id="L50" class="LineNr"> 50 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
+<span id="L51" class="LineNr"> 51 </span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="SalientComment">## stream = open(filename, O_RDONLY, 0)</span>
+<span id="L53" class="LineNr"> 53 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              filename/imm32          <span class="Comment"># copy to EBX</span>
+<span id="L54" class="LineNr"> 54 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32/rdonly          <span class="Comment"># copy 0 to ECX</span>
+<span id="L55" class="LineNr"> 55 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x180/imm32/fixed-perms <span class="Comment"># copy to EDX</span>
+<span id="L56" class="LineNr"> 56 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              5/imm32/open            <span class="Comment"># copy 5 to EAX</span>
+<span id="L57" class="LineNr"> 57 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="Comment"># save stream</span>
+<span id="L59" class="LineNr"> 59 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              stream/imm32            <span class="Comment"># copy to EBX</span>
+<span id="L60" class="LineNr"> 60 </span>  89/copy                         0/mod/indirect  3/rm32/EBX                                          0/r32/EAX                                           <span class="Comment"># copy EAX to *EBX</span>
+<span id="L61" class="LineNr"> 61 </span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="SalientComment">## read(stream, b, 1)</span>
+<span id="L63" class="LineNr"> 63 </span>  <span class="Comment"># load stream</span>
+<span id="L64" class="LineNr"> 64 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              stream/imm32            <span class="Comment"># copy to EBX</span>
+<span id="L65" class="LineNr"> 65 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="Comment">#</span>
+<span id="L67" class="LineNr"> 67 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              b/imm32                 <span class="Comment"># copy to ECX</span>
+<span id="L68" class="LineNr"> 68 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/size            <span class="Comment"># copy 1 to EDX</span>
+<span id="L69" class="LineNr"> 69 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              3/imm32/read            <span class="Comment"># copy 3 to EAX</span>
+<span id="L70" class="LineNr"> 70 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
+<span id="L71" class="LineNr"> 71 </span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="SalientComment">## close(stream)</span>
+<span id="L73" class="LineNr"> 73 </span>  <span class="Comment"># load stream</span>
+<span id="L74" class="LineNr"> 74 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              stream/imm32            <span class="Comment"># copy to EBX</span>
+<span id="L75" class="LineNr"> 75 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
+<span id="L76" class="LineNr"> 76 </span>  <span class="Comment">#</span>
+<span id="L77" class="LineNr"> 77 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              6/imm32/close           <span class="Comment"># copy 6 to EAX</span>
+<span id="L78" class="LineNr"> 78 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
+<span id="L79" class="LineNr"> 79 </span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="SalientComment">## unlink(filename)</span>
+<span id="L81" class="LineNr"> 81 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              filename/imm32          <span class="Comment"># copy to EBX</span>
+<span id="L82" class="LineNr"> 82 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xa/imm32/unlink        <span class="Comment"># copy 10 to EAX</span>
+<span id="L83" class="LineNr"> 83 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
+<span id="L84" class="LineNr"> 84 </span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="SalientComment">## exit(b)</span>
+<span id="L86" class="LineNr"> 86 </span>  <span class="Comment"># load b</span>
+<span id="L87" class="LineNr"> 87 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              b/imm32                 <span class="Comment"># copy to EBX</span>
+<span id="L88" class="LineNr"> 88 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
+<span id="L89" class="LineNr"> 89 </span>  <span class="Comment">#</span>
+<span id="L90" class="LineNr"> 90 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit            <span class="Comment"># copy 1 to EAX</span>
+<span id="L91" class="LineNr"> 91 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
+<span id="L92" class="LineNr"> 92 </span>
+<span id="L93" class="LineNr"> 93 </span>== <a href='011run.cc.html#L122'>data</a>
+<span id="L94" class="LineNr"> 94 </span>stream:
+<span id="L95" class="LineNr"> 95 </span>00 00 00 00
+<span id="L96" class="LineNr"> 96 </span>a:
+<span id="L97" class="LineNr"> 97 </span>61 00 00 00
+<span id="L98" class="LineNr"> 98 </span>b:
+<span id="L99" class="LineNr"> 99 </span>00 00 00 00
+<span id="L100" class="LineNr">100 </span>filename:
+<span id="L101" class="LineNr">101 </span>2e 66 6f 6f 00 00 00 00
+<span id="L102" class="LineNr">102 </span>
+<span id="L103" class="LineNr">103 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:tw&amp;</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/examples/ex8.subx.html b/html/subx/examples/ex8.subx.html
new file mode 100644
index 00000000..a20af2b4
--- /dev/null
+++ b/html/subx/examples/ex8.subx.html
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/examples/ex8.subx</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<style type="text/css">
+<!--
+pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+a { color:#eeeeee; text-decoration: none; }
+a:hover { text-decoration: underline; }
+* { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
+.Delimiter { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="Comment"># Example reading commandline arguments: compute length of first arg.</span>
+<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
+<span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run:</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate ex9.subx ex9</span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run ex9 abc de fghi</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Comment"># Expected result:</span>
+<span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ echo $?</span>
+<span id="L8" class="LineNr"> 8 </span><span class="Comment">#   3  # length of 'abc'</span>
+<span id="L9" class="LineNr"> 9 </span><span class="Comment">#</span>
+<span id="L10" class="LineNr">10 </span><span class="Comment"># At the start of a SubX program:</span>
+<span id="L11" class="LineNr">11 </span><span class="Comment">#   argc: *ESP</span>
+<span id="L12" class="LineNr">12 </span><span class="Comment">#   argv[0]: *(ESP+4)</span>
+<span id="L13" class="LineNr">13 </span><span class="Comment">#   argv[1]: *(ESP+8)</span>
+<span id="L14" class="LineNr">14 </span><span class="Comment">#   ...</span>
+<span id="L15" class="LineNr">15 </span><span class="Comment"># Locals start from ESP-4 downwards.</span>
+<span id="L16" class="LineNr">16 </span>
+<span id="L17" class="LineNr">17 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L18" class="LineNr">18 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L19" class="LineNr">19 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L20" class="LineNr">20 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L21" class="LineNr">21 </span>  <span class="Comment"># var s = argv[1] (EBX)</span>
+<span id="L22" class="LineNr">22 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              3/r32/EBX   8/disp8        <span class="Delimiter"> . </span>                      <span class="Comment"># copy *(ESP+8) to EBX</span>
+<span id="L23" class="LineNr">23 </span>  <span class="Comment"># call ascii_length(EBX)</span>
+<span id="L24" class="LineNr">24 </span>    <span class="Comment"># prepare call</span>
+<span id="L25" class="LineNr">25 </span>  55/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># push EBP</span>
+<span id="L26" class="LineNr">26 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy ESP to EBP</span>
+<span id="L27" class="LineNr">27 </span>    <span class="Comment"># push args</span>
+<span id="L28" class="LineNr">28 </span>  53/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># push EBX</span>
+<span id="L29" class="LineNr">29 </span>    <span class="Comment"># call</span>
+<span id="L30" class="LineNr">30 </span>  e8/call                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          ascii_length/disp32
+<span id="L31" class="LineNr">31 </span>    <span class="Comment"># discard args</span>
+<span id="L32" class="LineNr">32 </span>  5a/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># pop into EDX</span>
+<span id="L33" class="LineNr">33 </span>    <span class="Comment"># clean up after call</span>
+<span id="L34" class="LineNr">34 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy EBP to ESP</span>
+<span id="L35" class="LineNr">35 </span>  5d/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># pop to EBP</span>
+<span id="L36" class="LineNr">36 </span>
+<span id="L37" class="LineNr">37 </span>  <span class="Comment"># exit(EAX)</span>
+<span id="L38" class="LineNr">38 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy EAX to EBX</span>
+<span id="L39" class="LineNr">39 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit            <span class="Comment"># copy 1 to EAX</span>
+<span id="L40" class="LineNr">40 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
+<span id="L41" class="LineNr">41 </span>
+<span id="L42" class="LineNr">42 </span>ascii_length:  <span class="Comment"># (s)</span>
+<span id="L43" class="LineNr">43 </span>  <span class="Comment"># initialize s (EDX)</span>
+<span id="L44" class="LineNr">44 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              2/r32/EDX   4/disp8                                 <span class="Comment"># copy *(ESP+4) to EDX</span>
+<span id="L45" class="LineNr">45 </span>  <span class="Comment"># var result = 0 (EAX)</span>
+<span id="L46" class="LineNr">46 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32                 <span class="Comment"># copy 1 to EAX</span>
+<span id="L47" class="LineNr">47 </span>$al_loop:
+<span id="L48" class="LineNr">48 </span>  <span class="Comment"># var c = *s (ECX)</span>
+<span id="L49" class="LineNr">49 </span>  8a/copy                         0/mod/*         2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy byte at *EDX to lower byte of ECX</span>
+<span id="L50" class="LineNr">50 </span>  <span class="Comment"># if c == '\0' break</span>
+<span id="L51" class="LineNr">51 </span>  81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32                 <span class="Comment"># compare ECX with 0</span>
+<span id="L52" class="LineNr">52 </span>  74/jump-if-zero                <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              $al_ret/disp8           <span class="Comment"># jump if equal</span>
+<span id="L53" class="LineNr">53 </span>  <span class="Comment"># ++s</span>
+<span id="L54" class="LineNr">54 </span>  81          0/subop/add         3/mod/direct    2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32                 <span class="Comment"># add 1 to EDX</span>
+<span id="L55" class="LineNr">55 </span>  <span class="Comment"># ++result</span>
+<span id="L56" class="LineNr">56 </span>  81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32                 <span class="Comment"># add 1 to EAX</span>
+<span id="L57" class="LineNr">57 </span>  <span class="Comment"># loop</span>
+<span id="L58" class="LineNr">58 </span>  eb/jump                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              $al_loop/disp8          <span class="Comment"># jump $al_loop</span>
+<span id="L59" class="LineNr">59 </span>$al_ret:
+<span id="L60" class="LineNr">60 </span>  <span class="Comment"># return (result in EAX)</span>
+<span id="L61" class="LineNr">61 </span>  c3/return
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->